Skip to content
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

Flutter stable framework 1.20.3 cherrypicks #64984

Conversation

christopherfujino
Copy link
Member

@christopherfujino christopherfujino commented Aug 31, 2020

Scheduled Cherrypicks

Test/Infra-Only Cherrypicks

Presubmit Known Failures

Postsubmit Known Failures

@flutter-dashboard flutter-dashboard bot added a: internationalization Supporting other languages or locales. (aka i18n) engine flutter/engine repository. See also e: labels. f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. team Infra upgrades, team productivity, code health, technical debt. See also team: labels. tool Affects the "flutter" command-line tool. See also t: labels. labels Aug 31, 2020
@christopherfujino christopherfujino changed the base branch from master to flutter-1.20-candidate.7 August 31, 2020 23:28
@flutter-dashboard
Copy link

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 flutter-1.20-candidate.7. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

@flutter-dashboard flutter-dashboard bot changed the base branch from flutter-1.20-candidate.7 to master August 31, 2020 23:28
@christopherfujino christopherfujino changed the base branch from master to flutter-1.20-candidate.7 August 31, 2020 23:29
aam and others added 4 commits August 31, 2020 16:31
…). (flutter#64519)

Added instructions on how to regenerate certificate too.
Fixes flutter#45075
Fixes flutter#57210

If an asset was included directly from the project root directory, then the same asset when copied to various output or ephemeral directories would also be picked up as an asset variant. This could cause assets to be recursively copied into asset/build/ephemeral directories, as each time it would run it would pick up all of the previous "variants".

The solution is to include project ephemeral directories, in addition to the build directory.
@googlebot
Copy link

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

Copy link
Member

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@pcsosinski pcsosinski left a comment

Choose a reason for hiding this comment

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

approved for branch. don't forget to sign the engine :)

@christopherfujino
Copy link
Member Author

approved for branch. don't forget to sign the engine :)

Thanks for checking, I did already.

@christopherfujino
Copy link
Member Author

@a14n please look for review, and also CLABot needs consent again :P

Copy link
Contributor

@HansMuller HansMuller left a comment

Choose a reason for hiding this comment

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

LGTM

@a14n
Copy link
Contributor

a14n commented Sep 1, 2020

@googlebot I consent

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@a14n
Copy link
Contributor

a14n commented Sep 1, 2020

LGTM

@googlebot googlebot added cla: yes and removed cla: no labels Sep 1, 2020
Copy link
Contributor

@rami-a rami-a left a comment

Choose a reason for hiding this comment

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

LGTM for time picker change

@christopherfujino
Copy link
Member Author

christopherfujino commented Sep 1, 2020

Re-running framework_tests-misc-windows (it was a timeout downloading from pub).

Update: passed on re-run, everything is green except for expected failures, which I've tracked in the description.

@christopherfujino
Copy link
Member Author

Friendly ping @jmagman for the #61129 cherrypick.

Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

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

LGTM

@jmagman
Copy link
Member

jmagman commented Sep 1, 2020

Friendly ping @jmagman for the #61129 cherrypick.

Sorry, thought @jonahwilliams's was enough.

@christopherfujino
Copy link
Member Author

Friendly ping @jmagman for the #61129 cherrypick.

Sorry, thought @jonahwilliams's was enough.

Yeah, sorry, I should have been more clear. For extra safety I'm trying out getting multiple reviewers per cherry pick, starting this week.

Speaking of which, @goderbauer could you verify the change to packages/flutter/lib/src/foundation/_isolates_io.dart

@HansMuller
Copy link
Contributor

@christopherfujino - Michael is out this week; is there someone else who could LGTM the change to packages/flutter/lib/src/foundation/_isolates_io.dart?

@christopherfujino
Copy link
Member Author

@christopherfujino - Michael is out this week; is there someone else who could LGTM the change to packages/flutter/lib/src/foundation/_isolates_io.dart?

Ahh, thanks. In that case, I can LGTM it :)

@christopherfujino christopherfujino merged commit 216dee6 into flutter:flutter-1.20-candidate.7 Sep 1, 2020
@christopherfujino
Copy link
Member Author

Merging with the failures all known and issues filed, see PR description for details.

@christopherfujino christopherfujino deleted the cherrypicks-flutter-1.20-candidate.7 branch September 1, 2020 19:25
mohammedJ-Sadiq added a commit to mohammedJ-Sadiq/flutter that referenced this pull request Jan 17, 2021
* Update engine hash to 1.20.3
* Re-enable image_list test with updated certificate(good for 3650 days). (flutter#64519)
* [Material] Relanding fix to ensure time picker input mode lays out correctly in RTL (flutter#64097)
* allow null in compute for weak mode (flutter#63515)
* [flutter_tools] fix recursive asset variant issue (flutter#61129)
* [flutter_tool] Handle Windows line endings in packages_test.dart (flutter#63806)
* [flutter_tool] Fix some create_test.dart tests on Windows (flutter#63796)

Co-authored-by: Alexander Aprelev <[email protected]>
Co-authored-by: Rami <[email protected]>
Co-authored-by: Alexandre Ardhuin <[email protected]>
Co-authored-by: Jonah Williams <[email protected]>
Co-authored-by: Zachary Anderson <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
a: internationalization Supporting other languages or locales. (aka i18n) d: examples Sample code and demos engine flutter/engine repository. See also e: labels. f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. team Infra upgrades, team productivity, code health, technical debt. See also team: labels. tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants