Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[tool] More main-branch detection improvement #7067

Conversation

stuartmorgan-g
Copy link
Contributor

Follow-up to #7038 to try to make it work on LUCI. Looking at the checkout steps of a LUCI run, it looks like we do a full fetch of origin, but likely only have a master branch locally. Rather than rely on a specific local branch name existing, this allows for checking origin (and just in case, since it's another common remote name, upstream).

Hopefully fixes flutter/flutter#119330

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/plugins repo does use dart format.)
  • I signed the [CLA].
  • The title of the PR starts with the name of the plugin 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.

Follow-up to flutter#7038 to try to make
it work on LUCI. Looking at the checkout steps of a LUCI run, it looks
like we do a full `fetch` of `origin`, but likely only have a `master`
branch locally. Rather than rely on a specific local branch name
existing, this allows for checking `origin` (and just in case, since
it's another common remote name, `upstream`).

Hopefully fixes flutter/flutter#119330
@stuartmorgan-g
Copy link
Contributor Author

I tried to recreate a LUCI repo checkout locally, and it did have origin/main but no main, so I'm hopeful that this will in fact work this time.

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.

Seems to be working

@stuartmorgan-g
Copy link
Contributor Author

Seems to be working

No way to actually know until I land it and then run more PRs, because only postsubmit is not working.

@stuartmorgan-g stuartmorgan-g merged commit 3d81a00 into flutter:main Feb 1, 2023
@stuartmorgan-g stuartmorgan-g deleted the tool-main-branch-detection-second-try branch February 1, 2023 00:52
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 2, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Feb 2, 2023
* 8f83dc29b [various] Standardize the extension for Pigeon-generated Dart (flutter/plugins#7029)

* 8fcff8756 Roll Flutter from 75680ae to 0a22a1d (3 revisions) (flutter/plugins#7051)

* 3d81a0071 [tool] More main-branch detection improvement (flutter/plugins#7067)

* e41f9f95e [ci] Clean up analysis options (flutter/plugins#7068)

* 4cf6f4494 [in_app_puchase_storekit] handle `appStoreReceiptURL` is nil (flutter/plugins#7069)

* d5bab1668 prepare for TestDefaultBinaryMessengerBinding.instance becoming non-nullable (flutter/plugins#6847)

* 36d8066cf Roll Flutter from 0a22a1d to d278808 (58 revisions) (flutter/plugins#7078)

* ec463866f [various] prepare for more const widgets (flutter/plugins#7074)

* dbf8d8d07 Change google_sign_in_ios and image_picker_ios owners (flutter/plugins#7070)

* 1d4570bb0 Update README.md (flutter/plugins#7076)

* 9302d87ee [ci] More cirrus.yml pre-alignment with flutter/packages (flutter/plugins#7079)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

flutter/plugins postsubmit LUCI tests are running too many tests
2 participants