Skip to content

v1.12.13+hotfix.3 cherry-picks #46204

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.

Sign up for GitHub

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

Jump to bottom
Merged
tvolkert merged 8 commits into from
Dec 6, 2019
Merged

v1.12.13+hotfix.3 cherry-picks #46204

tvolkert merged 8 commits into from
Dec 6, 2019

Conversation

@tvolkert
Copy link
Contributor

@tvolkert tvolkert commented Dec 6, 2019 •
edited
Loading

@fluttergithubbot fluttergithubbot changed the base branch from v1.12.13-hotfixes to master December 6, 2019 01:34
@fluttergithubbot
Copy link
Contributor

fluttergithubbot commented Dec 6, 2019

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

@fluttergithubbot fluttergithubbot added engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Dec 6, 2019
@tvolkert tvolkert changed the base branch from master to v1.12.13-hotfixes December 6, 2019 01:34
@tvolkert
Copy link
Contributor Author

tvolkert commented Dec 6, 2019

@jmagman there were merge conflicts when merging fb69a39, so please have a look and make sure it looks good.

jmagman
jmagman approved these changes Dec 6, 2019
View reviewed changes
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.

fb69a39 part LGTM
Thanks, @tvolkert!

zanderso
zanderso approved these changes Dec 6, 2019
View reviewed changes
Copy link
Member

@zanderso zanderso left a comment

Choose a reason for hiding this comment

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

lgtm

dnfield
dnfield approved these changes Dec 6, 2019
View reviewed changes
Copy link
Contributor

@dnfield dnfield 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 is the test failure related to changes you made?

@jmagman
Copy link
Member

jmagman commented Dec 6, 2019

@jmagman is the test failure related to changes you made?

stderr: ld: building for iOS, but linking in object file (/private/var/folders/sy/2x5qvs0n4lg18fry9jz4y21m0000gn/T/flutter_module_test.QcOdS3/hello/build/ios/framework/Profile/iphoneos/arm64/snapshot_assembly.o) built for macOS

Yes, but actually another really bad bug already fixed in v1.13.0, exposed I believe by setting isysroot in this change but not where snapshot_assembly.o is cc'd.

#45436 (specifically line 6b11f18#diff-77d60a41797d03aa9a7de0c742b17ef1R254)

@tvolkert should we grab that change, too? Or do you want me to clean this up to the minimum possible fix?

@jmagman
Copy link
Member

jmagman commented Dec 6, 2019

#45436

I assume that was the merge conflict, too.

@tvolkert
Copy link
Contributor Author

tvolkert commented Dec 6, 2019

Yeah that was the merged conflict. I applied it here (technically #45560)

PTAL

jmagman
jmagman approved these changes Dec 6, 2019
View reviewed changes
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, thanks!

@tvolkert tvolkert merged commit 57f2df7 into flutter:v1.12.13-hotfixes Dec 6, 2019
@tvolkert tvolkert deleted the v1.12.13-hotfixes branch December 6, 2019 05:23
@yutae yutae mentioned this pull request Jan 13, 2020
Merged
A-yum3 added a commit to A-yum3/flutter that referenced this pull request Jan 15, 2020
@A-yum3
Merge branch 'v1.12.13-hotfixes' of github.com:Javateaboy/flutter
98a8347 
* 'v1.12.13-hotfixes' of github.com:Javateaboy/flutter:
  v1.12.13+hotfix.6 cherry-picks (flutter#46741)
  v1.12.13+hotfix.5 cherry-picks (flutter#46726)
  v1.12.13+hotfix.4 cherry-picks (flutter#46632)
  v1.12.13+hotfix.3 cherry-picks (flutter#46204)
  v1.12.13+hotfix.2 cherry-picks (flutter#46055)
  v1.12.13+hotfix.1 cherry-picks (flutter#45962)

# Conflicts:
#	.cirrus.yml
#	bin/internal/engine.version
#	dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
#	packages/flutter/lib/src/rendering/sliver_fill.dart
#	packages/flutter/lib/src/widgets/sliver.dart
#	packages/flutter/test/widgets/page_view_test.dart
#	packages/flutter_tools/gradle/flutter.gradle
#	packages/flutter_tools/lib/src/base/build.dart
#	packages/flutter_tools/lib/src/commands/build_ios_framework.dart
#	packages/flutter_tools/lib/src/commands/upgrade.dart
#	packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
#	packages/flutter_tools/test/general.shard/base/build_test.dart
#	packages/flutter_tools/test/general.shard/features_test.dart
RaviKavaiya pushed a commit to RaviKavaiya/flutter that referenced this pull request Jan 17, 2020
@tvolkert @RaviKavaiya
v1.12.13+hotfix.3 cherry-picks (flutter#46204)
20e51ee 
* flutter/engine@ac93919 v1.12.13+hotfix.3 cherry-picks
  * flutter/engine@73da385 Disable a11y on detach
* d88345e only run codecov on master
* 6d848eb Name the docker_builer shard
* e98acc7 [flutter_tool] Print version info on a no-op upgrade
* 8eb6a92 Always compile with isysroot on iOS to point to SDK root
* fb69a39 Add bitcode and architectures to App.framework build ios framework command
@jmagman jmagman mentioned this pull request Feb 5, 2020
Closed
responilla07 pushed a commit to responilla07/flutter that referenced this pull request Jun 8, 2020
@tvolkert @responilla07
v1.12.13+hotfix.3 cherry-picks (flutter#46204)
608bf84 
* flutter/engine@ac93919 v1.12.13+hotfix.3 cherry-picks
  * flutter/engine@73da385 Disable a11y on detach
* d88345e only run codecov on master
* 6d848eb Name the docker_builer shard
* e98acc7 [flutter_tool] Print version info on a no-op upgrade
* 8eb6a92 Always compile with isysroot on iOS to point to SDK root
* fb69a39 Add bitcode and architectures to App.framework build ios framework command
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jmagman jmagman jmagman approved these changes

@zanderso zanderso zanderso approved these changes

+1 more reviewer

@dnfield dnfield dnfield approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt. engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@tvolkert @fluttergithubbot @jmagman @zanderso @dnfield @googlebot @christopherfujino