Skip to content

Check for tracked engine.version before overriding#163672

Merged
jtmcdole merged 3 commits intoflutter:masterfrom
jtmcdole:engineVersionTracked
Feb 20, 2025
Merged

Check for tracked engine.version before overriding#163672
jtmcdole merged 3 commits intoflutter:masterfrom
jtmcdole:engineVersionTracked

Conversation

@jtmcdole
Copy link
Member

Checking out a flutter release tag (e.g. 3.29.0) will see the checked in engine.version file overridden. Don't do that.

See: #163308

Checking out a flutter release tag (e.g. `3.29.0`) will see the checked
in engine.version file overridden. Don't do that.

See: flutter#163308
@jtmcdole jtmcdole requested a review from matanlurey February 19, 2025 23:00
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

Copy link
Contributor

@matanlurey matanlurey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approach LG.

It looks like this pull request may not have tests.

Add a test: https://github.com/flutter/flutter/blob/master/dev/tools/test/update_engine_version_test.dart 😄

@jtmcdole
Copy link
Member Author

Approach LG.

It looks like this pull request may not have tests.

Add a test: https://github.com/flutter/flutter/blob/master/dev/tools/test/update_engine_version_test.dart 😄

Looking to add tests. How I've tested locally with the new update:

  1. Shallow clone of 3.29.0
  2. Copy over these files
  3. run flutter tools and see that the checked in version downloads and the file isn't modified.

I moved the check up higher so it will work if you don't track main / master.

@jtmcdole jtmcdole requested a review from matanlurey February 20, 2025 00:35
Copy link
Contributor

@matanlurey matanlurey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Boom! Looks great, thanks for the tests!

@jtmcdole
Copy link
Member Author

Boom! Looks great, thanks for the tests!

thanks for writing the tooling that did all the linking in temp directories.

@jtmcdole jtmcdole added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 20, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 20, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Feb 20, 2025

autosubmit label was removed for flutter/flutter/163672, because - The status or check suite Windows build_tests_8_9 has failed. Please fix the issues identified (or deflake) before re-applying this label.

@jtmcdole jtmcdole added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 20, 2025
@jtmcdole jtmcdole added this pull request to the merge queue Feb 20, 2025
Merged via the queue into flutter:master with commit 19f23f2 Feb 20, 2025
147 of 148 checks passed
@jtmcdole jtmcdole deleted the engineVersionTracked branch February 20, 2025 04:00
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 20, 2025
@jtmcdole jtmcdole added cp: stable cherry pick this pull request to stable release candidate branch cp: beta cherry pick this pull request to beta release candidate branch labels Feb 20, 2025
@flutteractionsbot
Copy link

Failed to create CP due to merge conflicts.
You will need to create the PR manually. See the cherrypick wiki for more info.

flutteractionsbot pushed a commit to flutteractionsbot/flutter that referenced this pull request Feb 20, 2025
Checking out a flutter release tag (e.g. `3.29.0`) will see the checked
in engine.version file overridden. Don't do that.

See: flutter#163308
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 21, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 21, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 21, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 21, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 21, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 22, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 22, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 22, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 22, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 24, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 24, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 24, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 24, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 24, 2025
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Feb 24, 2025
Manual roll Flutter from 39b4951 to 911aa75 (56 revisions)

Manual roll requested by [email protected]

flutter/flutter@39b4951...911aa75

2025-02-21 [email protected] Remove legacy scenec stuff from flutter_tool (flutter/flutter#163569)
2025-02-21 [email protected] [fuchsia] reorder tests in test_suites.yaml and update the comment (flutter/flutter#163799)
2025-02-21 [email protected] Roll Dart SDK from 7ceb3be8ed0a to c5e582f15b6c (2 revisions) (flutter/flutter#163844)
2025-02-21 [email protected] Roll Packages from a9b9172 to 5a721da (2 revisions) (flutter/flutter#163848)
2025-02-21 [email protected] Roll Dart SDK from ad642ee6f94b to 7ceb3be8ed0a (2 revisions) (flutter/flutter#163832)
2025-02-21 [email protected] Update how to use VSCode with `clangd` after the monorepo merge (flutter/flutter#163671)
2025-02-21 [email protected] Reland #163711 after #163780 (flutter/flutter#163812)
2025-02-21 [email protected] Fix incorrect function name in FlutterEngineRun documentation (flutter/flutter#163696)
2025-02-21 [email protected] Roll Dart SDK from 557cbf2c7da6 to ad642ee6f94b (5 revisions) (flutter/flutter#163794)
2025-02-21 [email protected] [canvaskit] Use `visualViewport.scale` to determine device pixel ratio. (flutter/flutter#163688)
2025-02-21 [email protected] [DisplayList] Migrate rendering tests and benchmarks to DL geometry (flutter/flutter#163766)
2025-02-21 [email protected] Make `releaseMode` explicit, inform `determineDevDependencies` entirely on the flag (flutter/flutter#163780)
2025-02-21 [email protected] Ensure `exclude_dev_dependencies_test` runs if `flutter_tools` changes. (flutter/flutter#163768)
2025-02-21 [email protected] WebKit should respect TextCapitalization.words (flutter/flutter#161027)
2025-02-21 [email protected] CupertinoSliverNavigationBar.search fidelity updates (flutter/flutter#163089)
2025-02-21 [email protected] feat: Add selectionColor property to selectable text (flutter/flutter#162177)
2025-02-20 [email protected] Restore `linux_android_emulator_tests` to CI. (flutter/flutter#163747)
2025-02-20 [email protected] introduce system color palette (flutter/flutter#163335)
2025-02-20 [email protected] [web] DRY up access to headers required for multi-threaded WebAssembly (flutter/flutter#163555)
2025-02-20 [email protected] fix(CupertinoDatePicker): font is inconsistent (flutter/flutter#162932)
2025-02-20 [email protected] Create Android-API-And-Related-Versions.md (flutter/flutter#163556)
2025-02-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Avoid implicitly setting `determineDevDependencies: true` (it's not a safe operation) (#163711)" (flutter/flutter#163762)
2025-02-20 [email protected] Revert "Create g3_bug.yml" (flutter/flutter#163757)
2025-02-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Make Flutter version information accessible at runtime (#140783)" (flutter/flutter#163753)
2025-02-20 [email protected] Skip Xcode install on mac_mokey Android tests (flutter/flutter#163685)
2025-02-20 [email protected] Roll Dart SDK from 2cecb16348e4 to 557cbf2c7da6 (3 revisions) (flutter/flutter#163705)
2025-02-20 [email protected] Add `FlutterVersion.engineCommitDate`, helps signal engine artifact SHA issues (flutter/flutter#163652)
2025-02-20 [email protected] Avoid implicitly setting `determineDevDependencies: true` (it's not a safe operation) (flutter/flutter#163711)
2025-02-20 [email protected] It is now safe to call `getBuildMode().release` (flutter/flutter#163712)
2025-02-20 [email protected] [iOS] remove Skia interfaces from iOS platform code. (flutter/flutter#163505)
2025-02-20 [email protected] Make Flutter version information accessible at runtime (flutter/flutter#140783)
2025-02-20 [email protected] [windows] Implement merged UI and platform thread (flutter/flutter#162935)
2025-02-20 [email protected] `CircularProgressIndicator` throws null exception (flutter/flutter#163356)
2025-02-20 [email protected] Fix the issue where DropdownMenu does not gain focus when tapped. (flutter/flutter#162874)
2025-02-20 [email protected] Check for tracked engine.version before overriding (flutter/flutter#163672)
2025-02-20 [email protected] showDialogs adds a `requestFocus` parameter. (flutter/flutter#162928)
2025-02-20 [email protected] Create helper method to dispatch object creation and disposal. (flutter/flutter#163637)
2025-02-20 [email protected] Redistribute iOS TESTOWNERS (flutter/flutter#163653)
2025-02-20 [email protected] enclosingElement -> enclosingElement3 (flutter/flutter#163681)
2025-02-19 [email protected] [ Widget Preview ] Move `preview_detector_test.dart` from `general.shard` to `commands.shard` (flutter/flutter#163619)
2025-02-19 [email protected] [iOS] always post new task during gesture dispatch. (flutter/flutter#163646)
2025-02-19 [email protected] Allow flutter tools to detach a running Chrome session (flutter/flutter#163349)
2025-02-19 [email protected] Reland "[Impeller] add support for rational bezier conics to Path (#63282)" (flutter/flutter#163645)
2025-02-19 [email protected] [web:a11y] wheel events switch to pointer mode (flutter/flutter#163582)
...
nathanael-h added a commit to nathanael-h/docker-images-flutter that referenced this pull request Mar 2, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 21, 2025
androidseb pushed a commit to androidseb/packages that referenced this pull request Jun 8, 2025
)

Manual roll Flutter from 39b4951 to 911aa75 (56 revisions)

Manual roll requested by [email protected]

flutter/flutter@39b4951...911aa75

2025-02-21 [email protected] Remove legacy scenec stuff from flutter_tool (flutter/flutter#163569)
2025-02-21 [email protected] [fuchsia] reorder tests in test_suites.yaml and update the comment (flutter/flutter#163799)
2025-02-21 [email protected] Roll Dart SDK from 7ceb3be8ed0a to c5e582f15b6c (2 revisions) (flutter/flutter#163844)
2025-02-21 [email protected] Roll Packages from a9b9172 to 5a721da (2 revisions) (flutter/flutter#163848)
2025-02-21 [email protected] Roll Dart SDK from ad642ee6f94b to 7ceb3be8ed0a (2 revisions) (flutter/flutter#163832)
2025-02-21 [email protected] Update how to use VSCode with `clangd` after the monorepo merge (flutter/flutter#163671)
2025-02-21 [email protected] Reland #163711 after #163780 (flutter/flutter#163812)
2025-02-21 [email protected] Fix incorrect function name in FlutterEngineRun documentation (flutter/flutter#163696)
2025-02-21 [email protected] Roll Dart SDK from 557cbf2c7da6 to ad642ee6f94b (5 revisions) (flutter/flutter#163794)
2025-02-21 [email protected] [canvaskit] Use `visualViewport.scale` to determine device pixel ratio. (flutter/flutter#163688)
2025-02-21 [email protected] [DisplayList] Migrate rendering tests and benchmarks to DL geometry (flutter/flutter#163766)
2025-02-21 [email protected] Make `releaseMode` explicit, inform `determineDevDependencies` entirely on the flag (flutter/flutter#163780)
2025-02-21 [email protected] Ensure `exclude_dev_dependencies_test` runs if `flutter_tools` changes. (flutter/flutter#163768)
2025-02-21 [email protected] WebKit should respect TextCapitalization.words (flutter/flutter#161027)
2025-02-21 [email protected] CupertinoSliverNavigationBar.search fidelity updates (flutter/flutter#163089)
2025-02-21 [email protected] feat: Add selectionColor property to selectable text (flutter/flutter#162177)
2025-02-20 [email protected] Restore `linux_android_emulator_tests` to CI. (flutter/flutter#163747)
2025-02-20 [email protected] introduce system color palette (flutter/flutter#163335)
2025-02-20 [email protected] [web] DRY up access to headers required for multi-threaded WebAssembly (flutter/flutter#163555)
2025-02-20 [email protected] fix(CupertinoDatePicker): font is inconsistent (flutter/flutter#162932)
2025-02-20 [email protected] Create Android-API-And-Related-Versions.md (flutter/flutter#163556)
2025-02-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Avoid implicitly setting `determineDevDependencies: true` (it's not a safe operation) (#163711)" (flutter/flutter#163762)
2025-02-20 [email protected] Revert "Create g3_bug.yml" (flutter/flutter#163757)
2025-02-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Make Flutter version information accessible at runtime (#140783)" (flutter/flutter#163753)
2025-02-20 [email protected] Skip Xcode install on mac_mokey Android tests (flutter/flutter#163685)
2025-02-20 [email protected] Roll Dart SDK from 2cecb16348e4 to 557cbf2c7da6 (3 revisions) (flutter/flutter#163705)
2025-02-20 [email protected] Add `FlutterVersion.engineCommitDate`, helps signal engine artifact SHA issues (flutter/flutter#163652)
2025-02-20 [email protected] Avoid implicitly setting `determineDevDependencies: true` (it's not a safe operation) (flutter/flutter#163711)
2025-02-20 [email protected] It is now safe to call `getBuildMode().release` (flutter/flutter#163712)
2025-02-20 [email protected] [iOS] remove Skia interfaces from iOS platform code. (flutter/flutter#163505)
2025-02-20 [email protected] Make Flutter version information accessible at runtime (flutter/flutter#140783)
2025-02-20 [email protected] [windows] Implement merged UI and platform thread (flutter/flutter#162935)
2025-02-20 [email protected] `CircularProgressIndicator` throws null exception (flutter/flutter#163356)
2025-02-20 [email protected] Fix the issue where DropdownMenu does not gain focus when tapped. (flutter/flutter#162874)
2025-02-20 [email protected] Check for tracked engine.version before overriding (flutter/flutter#163672)
2025-02-20 [email protected] showDialogs adds a `requestFocus` parameter. (flutter/flutter#162928)
2025-02-20 [email protected] Create helper method to dispatch object creation and disposal. (flutter/flutter#163637)
2025-02-20 [email protected] Redistribute iOS TESTOWNERS (flutter/flutter#163653)
2025-02-20 [email protected] enclosingElement -> enclosingElement3 (flutter/flutter#163681)
2025-02-19 [email protected] [ Widget Preview ] Move `preview_detector_test.dart` from `general.shard` to `commands.shard` (flutter/flutter#163619)
2025-02-19 [email protected] [iOS] always post new task during gesture dispatch. (flutter/flutter#163646)
2025-02-19 [email protected] Allow flutter tools to detach a running Chrome session (flutter/flutter#163349)
2025-02-19 [email protected] Reland "[Impeller] add support for rational bezier conics to Path (#63282)" (flutter/flutter#163645)
2025-02-19 [email protected] [web:a11y] wheel events switch to pointer mode (flutter/flutter#163582)
...
FMorschel pushed a commit to FMorschel/packages that referenced this pull request Jun 9, 2025
)

Manual roll Flutter from 39b4951 to 911aa75 (56 revisions)

Manual roll requested by [email protected]

flutter/flutter@39b4951...911aa75

2025-02-21 [email protected] Remove legacy scenec stuff from flutter_tool (flutter/flutter#163569)
2025-02-21 [email protected] [fuchsia] reorder tests in test_suites.yaml and update the comment (flutter/flutter#163799)
2025-02-21 [email protected] Roll Dart SDK from 7ceb3be8ed0a to c5e582f15b6c (2 revisions) (flutter/flutter#163844)
2025-02-21 [email protected] Roll Packages from a9b9172 to 5a721da (2 revisions) (flutter/flutter#163848)
2025-02-21 [email protected] Roll Dart SDK from ad642ee6f94b to 7ceb3be8ed0a (2 revisions) (flutter/flutter#163832)
2025-02-21 [email protected] Update how to use VSCode with `clangd` after the monorepo merge (flutter/flutter#163671)
2025-02-21 [email protected] Reland #163711 after #163780 (flutter/flutter#163812)
2025-02-21 [email protected] Fix incorrect function name in FlutterEngineRun documentation (flutter/flutter#163696)
2025-02-21 [email protected] Roll Dart SDK from 557cbf2c7da6 to ad642ee6f94b (5 revisions) (flutter/flutter#163794)
2025-02-21 [email protected] [canvaskit] Use `visualViewport.scale` to determine device pixel ratio. (flutter/flutter#163688)
2025-02-21 [email protected] [DisplayList] Migrate rendering tests and benchmarks to DL geometry (flutter/flutter#163766)
2025-02-21 [email protected] Make `releaseMode` explicit, inform `determineDevDependencies` entirely on the flag (flutter/flutter#163780)
2025-02-21 [email protected] Ensure `exclude_dev_dependencies_test` runs if `flutter_tools` changes. (flutter/flutter#163768)
2025-02-21 [email protected] WebKit should respect TextCapitalization.words (flutter/flutter#161027)
2025-02-21 [email protected] CupertinoSliverNavigationBar.search fidelity updates (flutter/flutter#163089)
2025-02-21 [email protected] feat: Add selectionColor property to selectable text (flutter/flutter#162177)
2025-02-20 [email protected] Restore `linux_android_emulator_tests` to CI. (flutter/flutter#163747)
2025-02-20 [email protected] introduce system color palette (flutter/flutter#163335)
2025-02-20 [email protected] [web] DRY up access to headers required for multi-threaded WebAssembly (flutter/flutter#163555)
2025-02-20 [email protected] fix(CupertinoDatePicker): font is inconsistent (flutter/flutter#162932)
2025-02-20 [email protected] Create Android-API-And-Related-Versions.md (flutter/flutter#163556)
2025-02-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Avoid implicitly setting `determineDevDependencies: true` (it's not a safe operation) (#163711)" (flutter/flutter#163762)
2025-02-20 [email protected] Revert "Create g3_bug.yml" (flutter/flutter#163757)
2025-02-20 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Make Flutter version information accessible at runtime (#140783)" (flutter/flutter#163753)
2025-02-20 [email protected] Skip Xcode install on mac_mokey Android tests (flutter/flutter#163685)
2025-02-20 [email protected] Roll Dart SDK from 2cecb16348e4 to 557cbf2c7da6 (3 revisions) (flutter/flutter#163705)
2025-02-20 [email protected] Add `FlutterVersion.engineCommitDate`, helps signal engine artifact SHA issues (flutter/flutter#163652)
2025-02-20 [email protected] Avoid implicitly setting `determineDevDependencies: true` (it's not a safe operation) (flutter/flutter#163711)
2025-02-20 [email protected] It is now safe to call `getBuildMode().release` (flutter/flutter#163712)
2025-02-20 [email protected] [iOS] remove Skia interfaces from iOS platform code. (flutter/flutter#163505)
2025-02-20 [email protected] Make Flutter version information accessible at runtime (flutter/flutter#140783)
2025-02-20 [email protected] [windows] Implement merged UI and platform thread (flutter/flutter#162935)
2025-02-20 [email protected] `CircularProgressIndicator` throws null exception (flutter/flutter#163356)
2025-02-20 [email protected] Fix the issue where DropdownMenu does not gain focus when tapped. (flutter/flutter#162874)
2025-02-20 [email protected] Check for tracked engine.version before overriding (flutter/flutter#163672)
2025-02-20 [email protected] showDialogs adds a `requestFocus` parameter. (flutter/flutter#162928)
2025-02-20 [email protected] Create helper method to dispatch object creation and disposal. (flutter/flutter#163637)
2025-02-20 [email protected] Redistribute iOS TESTOWNERS (flutter/flutter#163653)
2025-02-20 [email protected] enclosingElement -> enclosingElement3 (flutter/flutter#163681)
2025-02-19 [email protected] [ Widget Preview ] Move `preview_detector_test.dart` from `general.shard` to `commands.shard` (flutter/flutter#163619)
2025-02-19 [email protected] [iOS] always post new task during gesture dispatch. (flutter/flutter#163646)
2025-02-19 [email protected] Allow flutter tools to detach a running Chrome session (flutter/flutter#163349)
2025-02-19 [email protected] Reland "[Impeller] add support for rational bezier conics to Path (#63282)" (flutter/flutter#163645)
2025-02-19 [email protected] [web:a11y] wheel events switch to pointer mode (flutter/flutter#163582)
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cp: beta cherry pick this pull request to beta release candidate branch cp: stable cherry pick this pull request to stable release candidate branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants