Skip to content

[tool] Provide a --base-branch flag #3322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2023

Conversation

stuartmorgan-g
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g commented Feb 28, 2023

For CI, the default behavior of finding a base SHA for diffs using FETCH_HEAD works well because we can control FETCH_HEAD in the CI scripts. Now that we have a common use case (update-release-info) for running on changed packages locally instead of picking specific packges this has been problematic, because people get an
essentially-random-from-their-perspective diff base, or they have to provide an exact --base-sha which can be tricky as well.

This adds a new --base-branch which can be passed instead of --base-sha to give a simple way to get better behavior locally, and documents it for update-release-info.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the relevant style guides and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use dart format.)
  • I signed the CLA.
  • The title of the PR starts with the name of the package surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy, or this PR is exempt from version changes.
  • I updated CHANGELOG.md to add a description of the change, following repository CHANGELOG style.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

For CI, the default behavior of finding a base SHA for diffs using
`FETCH_HEAD` works well because we can control `FETCH_HEAD` in the CI
scripts. Now that we have a common use case (`update-release-info) for
running on changed packages locally instead of picking specific packges
this has been problematic, because people get an
essentially-random-from-their-perspective diff base, or they have to
provide an exact `--base-sha` which can be tricky as well.

This adds a new `--base-branch` which can be passed instead of
`--base-sha` to give a simple way to get better behavior locally,
and documents in for `update-release-info`.
Copy link
Contributor

@tarrinneal tarrinneal left a comment

Choose a reason for hiding this comment

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

This will be a nice qol upgrade

@stuartmorgan-g stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 1, 2023
@auto-submit auto-submit bot merged commit 0954499 into flutter:main Mar 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 1, 2023
@stuartmorgan-g stuartmorgan-g deleted the tool-better-base-flag branch March 1, 2023 21:11
sybrands-place pushed a commit to sybrands-place/packages that referenced this pull request Mar 6, 2023
* main: (3910 commits)
  [various] Align Flutter and Dart SDK constraints (flutter#3349)
  Roll Flutter from c590086 to f2f8005 (14 revisions) (flutter#3373)
  [webview_flutter] Enable warnings-as-errors on Android (flutter#3356)
  [ci] Increase Android platform test sharding (flutter#3365)
  Roll Flutter from f032a4d to c590086 (69 revisions) (flutter#3366)
  [Espresso] Update truth package to 1.1.3 (flutter#3358)
  [google_maps] Relax the Android renderer requset test (flutter#3364)
  [pigeon] Only check generated files on master (flutter#3357)
  [webview]: Bump androidx.webkit:webkit from 1.5.0 to 1.6.0 in /packages/webview_flutter/webview_flutter_android/android (flutter#3243)
  [ci+various] Partially enable javac warning checks (flutter#3293)
  [webview_flutter] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3336)
  [local_auth] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3335)
  [google_sign_in] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3330)
  [google_maps_flutter] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3329)
  [video_player] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3328)
  [file_selector] Update minimum Flutter version to 3.3 and iOS 11 (flutter#3325)
  [go_router_builder] Fix the example for default values in the README (flutter#3231)
  Update annotation and espresso dependencies (flutter#3271)
  [tool] Provide a --base-branch flag (flutter#3322)
  [image_picker_android] Adds Android 13 photo picker functionality (flutter#3267)
  ...
nploi pushed a commit to nploi/packages that referenced this pull request Jul 16, 2023
[tool] Provide a --base-branch flag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants