-
Notifications
You must be signed in to change notification settings - Fork 29.7k
Hotfix 8 - sign binaries and increase minimum Xcode version to 11 #50291
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
Hotfix 8 - sign binaries and increase minimum Xcode version to 11 #50291
Conversation
|
This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to v1.12.13-hotfixes. See the Release Process for information about how other branches get updated. Reviewers: Use caution before merging pull requests to branches other than master. The circumstances where this is valid are very rare. /cc @dnfield |
This is a hotfix. |
62c4bd6 to
17dbdb6
Compare
|
Should this include #50315? |
6aba911 to
8c82215
Compare
8c82215 to
4bc011e
Compare
|
|
||
| - name: verify_binaries_codesigned-macos # macos-only | ||
| # TODO(fujino): remove this `only_if` after https://github.com/flutter/flutter/issues/44372 | ||
| only_if: "$CIRRUS_BRANCH == 'dev' || $CIRRUS_BRANCH == 'beta' || $CIRRUS_BRANCH == 'stable' || $CIRRUS_BRANCH =~ '.*hotfix.*'" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why didn't verify_binaries_codesigned-macos run on this PR? We won't know if it passed until this is merged into stable, which is too late...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested this by commenting out the conditional and running the test. The reason it didn't run as is is because $CIRRUS_BRANCH is something like pull/50291 pre-submit. We'd catch a failure before before it landed in stable because hotfixes dont' get merged to stable until after CI is green on the hotfix branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, but even better, I can check $CIRRUS_BASE_BRANCH != 'master'...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will that catch random PRs off master that aren't codesigned too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, the githubbot should change those to be on master. Not sure if the bot changing the base will re-trigger the cirrus jobs.
| 'test.'); | ||
| exit(1); | ||
| } | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we run flutter precache --no-android to make sure the iOS engine artifacts are actually present?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea, I created this issue to track. For the sake of landing this hotfix, I won't cherry pick it here. This test will still catch when the batch codesigning job hasn't been run, as the dart sdk, libimobiledevice artifacts, and android gen snapshots are all cached by flutter doctor -v run in the setup_script (see https://cirrus-ci.com/task/6198934779461632).
jmagman
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, my comments can be resolved on master.
|
What's with the "Minimum supported Gradle version is 5.4.1. Current version is 4.10.2" error in It looks like the |
|
I'm bumping Gradle at #50388 |
@tvolkert can I land this on a red
|
|
Shoudl we just pull in the gradle fixes to this branch once they land upstream, so future hotfixes won't have to be as complicate? I'm also wondering if we should pull #49327 into this. |
The logcat fix makes sense. As for #50388, @blasten it seems like you're saying that PR shouldn't affect users, is that correct? If so, then we might as hotfix that as well. |
|
We could land this now and then land those other fixes on the |
sounds good, I'll do that now. |
|
@christopherfujino That is correct. #50388 doesn't change behavior for end users. |
Description
cherry pick:
In addition the
customer_testingtests initially failed on this PR because the cirrus config checks out ToT of https://github.com/flutter/tests, and upstream changes are incompatible with this version. I updated these tests in the.cirrus.ymlto check out the specific revision this repo was on when this release branched from master.Related Issues
Fixes #50066 and #49787
Tests
I added the following tests:
Cherry picked a cirrus integration test that verifies all binaries in the cache have been codesigned (only runs on macos).
Checklist
Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (
[x]). This will ensure a smooth and quick review process.///).flutter analyze --flutter-repo) does not report any problems on my PR.Breaking Change
Did any tests fail when you ran them? Please read [Handling breaking changes].