Allow a release without engine cherrypicks (adds fallback logic)#172184
Merged
matanlurey merged 1 commit intoflutter:masterfrom Jul 15, 2025
Merged
Conversation
jtmcdole
approved these changes
Jul 15, 2025
|
|
||
| $progName = Split-Path -parent $MyInvocation.MyCommand.Definition | ||
| $flutterRoot = (Get-Item $progName).parent.parent.FullName | ||
| $gitToplevel = (git rev-parse --show-toplevel).Trim() |
Member
There was a problem hiding this comment.
Non-blocking: This assumes this will only ever be run inside the flutter/**/ path. If someone runs ~/fluter/bin/internal/... from another git repo.. spicy.
| } | ||
|
|
||
| # 2. Define and search history range to search within (unique to changes on this branch). | ||
| $HISTORY_RANGE = "$MERGE_BASE_COMMIT..HEAD" |
Member
There was a problem hiding this comment.
on a release branch, the content hash will also use the release version file in internal. Not sure if you need that here or not. I guess that would be handled in the fallback on line 54.
| if [[ -z "$ENGINE_COMMIT" ]]; then | ||
| # Find the oldest commit on HEAD that is *not* reachable from MERGE_BASE_COMMIT. | ||
| # This is the first commit *on this branch* after it diverged from 'master'. | ||
| ENGINE_COMMIT="$(git log --pretty=format:%H --reverse --ancestry-path "$MERGE_BASE_COMMIT"..HEAD | head -n 1)" |
Member
There was a problem hiding this comment.
non-blocking; you can use "git log -1" instead of "| head -n 1" or Select-Object -First 1
Contributor
Author
|
I am going to ack all of these to get this change into the branch before branching, and I'll do a follow-up PR after: |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jul 16, 2025
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Jul 16, 2025
flutter/flutter@cc3110c...c2739f0 2025-07-16 [email protected] Roll Dart SDK from 2f2dd1780d45 to 766ee8029b11 (2 revisions) (flutter/flutter#172226) 2025-07-16 [email protected] Roll Skia from af685eaf1b52 to 59be8479c637 (3 revisions) (flutter/flutter#172208) 2025-07-16 [email protected] Add dartpad example to `RoundedSuperellipseBorder` (flutter/flutter#172185) 2025-07-16 [email protected] Roll Skia from ab79199bd0f3 to af685eaf1b52 (2 revisions) (flutter/flutter#172195) 2025-07-16 [email protected] Roll Dart SDK from a4e60e5add75 to 2f2dd1780d45 (8 revisions) (flutter/flutter#172197) 2025-07-16 [email protected] Roll pub packages (flutter/flutter#172193) 2025-07-15 [email protected] Licenses_cpp: Parses NOTICES and DEPS (flutter/flutter#172044) 2025-07-15 [email protected] Roll Fuchsia Linux SDK from tQAtsLtpc0oBIqRwC... to JRFUXSNXExcfjVYvA... (flutter/flutter#172189) 2025-07-15 [email protected] Roll Skia from fec78c0da2e6 to ab79199bd0f3 (4 revisions) (flutter/flutter#172186) 2025-07-15 [email protected] Allow a release without engine cherrypicks (adds fallback logic) (flutter/flutter#172184) 2025-07-15 [email protected] [skia] Add missing param to makeRasterImage calls (flutter/flutter#172122) 2025-07-15 [email protected] [Android] remove obsolete gradle api in FGP (flutter/flutter#172085) 2025-07-15 [email protected] Roll Skia from 8ffff8c8e01b to fec78c0da2e6 (6 revisions) (flutter/flutter#172178) 2025-07-15 [email protected] Roll Skia from 2f4ad5d83704 to 8ffff8c8e01b (7 revisions) (flutter/flutter#172169) 2025-07-15 [email protected] Roll Dart SDK to 3.9.0-333.2.beta (flutter/flutter#172167) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
azatech
pushed a commit
to azatech/flutter
that referenced
this pull request
Jul 28, 2025
azatech
pushed a commit
to azatech/flutter
that referenced
this pull request
Jul 28, 2025
…h operations) (flutter#172236) This fixes flutter#172184 by considering the last commit to `release-candidate-branch.version` as the significant commit. Otherwise, operationally, it works the same. I tested this on 3.35 and it works as expected (where the current does not).
vashworth
pushed a commit
to vashworth/packages
that referenced
this pull request
Jul 30, 2025
flutter/flutter@cc3110c...c2739f0 2025-07-16 [email protected] Roll Dart SDK from 2f2dd1780d45 to 766ee8029b11 (2 revisions) (flutter/flutter#172226) 2025-07-16 [email protected] Roll Skia from af685eaf1b52 to 59be8479c637 (3 revisions) (flutter/flutter#172208) 2025-07-16 [email protected] Add dartpad example to `RoundedSuperellipseBorder` (flutter/flutter#172185) 2025-07-16 [email protected] Roll Skia from ab79199bd0f3 to af685eaf1b52 (2 revisions) (flutter/flutter#172195) 2025-07-16 [email protected] Roll Dart SDK from a4e60e5add75 to 2f2dd1780d45 (8 revisions) (flutter/flutter#172197) 2025-07-16 [email protected] Roll pub packages (flutter/flutter#172193) 2025-07-15 [email protected] Licenses_cpp: Parses NOTICES and DEPS (flutter/flutter#172044) 2025-07-15 [email protected] Roll Fuchsia Linux SDK from tQAtsLtpc0oBIqRwC... to JRFUXSNXExcfjVYvA... (flutter/flutter#172189) 2025-07-15 [email protected] Roll Skia from fec78c0da2e6 to ab79199bd0f3 (4 revisions) (flutter/flutter#172186) 2025-07-15 [email protected] Allow a release without engine cherrypicks (adds fallback logic) (flutter/flutter#172184) 2025-07-15 [email protected] [skia] Add missing param to makeRasterImage calls (flutter/flutter#172122) 2025-07-15 [email protected] [Android] remove obsolete gradle api in FGP (flutter/flutter#172085) 2025-07-15 [email protected] Roll Skia from 8ffff8c8e01b to fec78c0da2e6 (6 revisions) (flutter/flutter#172178) 2025-07-15 [email protected] Roll Skia from 2f4ad5d83704 to 8ffff8c8e01b (7 revisions) (flutter/flutter#172169) 2025-07-15 [email protected] Roll Dart SDK to 3.9.0-333.2.beta (flutter/flutter#172167) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 14, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 14, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 15, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 15, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 16, 2025
ksokolovskyi
pushed a commit
to ksokolovskyi/flutter
that referenced
this pull request
Aug 19, 2025
ksokolovskyi
pushed a commit
to ksokolovskyi/flutter
that referenced
this pull request
Aug 19, 2025
…h operations) (flutter#172236) This fixes flutter#172184 by considering the last commit to `release-candidate-branch.version` as the significant commit. Otherwise, operationally, it works the same. I tested this on 3.35 and it works as expected (where the current does not).
mboetger
pushed a commit
to mboetger/flutter
that referenced
this pull request
Sep 18, 2025
mboetger
pushed a commit
to mboetger/flutter
that referenced
this pull request
Sep 18, 2025
…h operations) (flutter#172236) This fixes flutter#172184 by considering the last commit to `release-candidate-branch.version` as the significant commit. Otherwise, operationally, it works the same. I tested this on 3.35 and it works as expected (where the current does not).
lucaantonelli
pushed a commit
to lucaantonelli/flutter
that referenced
this pull request
Nov 21, 2025
lucaantonelli
pushed a commit
to lucaantonelli/flutter
that referenced
this pull request
Nov 21, 2025
…h operations) (flutter#172236) This fixes flutter#172184 by considering the last commit to `release-candidate-branch.version` as the significant commit. Otherwise, operationally, it works the same. I tested this on 3.35 and it works as expected (where the current does not).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #172179.