Skip to content

Conversation

@tvolkert
Copy link
Contributor

@tvolkert tvolkert commented Dec 4, 2019

  • flutter/engine@6955b06 Cherry-picks for 1.12.13
  • 09126ab Enable Android embedding v2 on the beta, dev and stable channel
  • 4c95bbd Re-enable hostonly tests on non-master branches
  • 066a992 Ensure that docker tag is legal
  • 4484ae4 [flutter_tool] Do not continue with a no-op 'upgrade'

@fluttergithubbot
Copy link
Contributor

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 changed the base branch from v1.12.13-hotfixes to master December 4, 2019 07:18
@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 4, 2019
@tvolkert tvolkert changed the base branch from master to v1.12.13-hotfixes December 4, 2019 07:19
@blasten
Copy link

blasten commented Dec 4, 2019

I think we also need 81724bd, which fixed #45468.

@tvolkert
Copy link
Contributor Author

tvolkert commented Dec 4, 2019

81724bd is 9 days old - it's already included in the base release.

@tvolkert tvolkert merged commit 4f54e46 into flutter:v1.12.13-hotfixes Dec 4, 2019
@tvolkert tvolkert deleted the v1.12.13-hotfixes branch December 4, 2019 17:20
@blasten
Copy link

blasten commented Dec 4, 2019

sweet. Thanks!

A-yum3 added a commit to A-yum3/flutter that referenced this pull request Jan 15, 2020
* '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
* flutter/engine@6955b06 Cherry-picks for 1.12.13
  * flutter/engine@3e6d6bc add pointer data santizing in flutter web engine
* 09126ab Enable Android embedding v2 on the beta, dev and stable channel
* 4c95bbd Re-enable hostonly tests on non-master branches
* 066a992 Ensure that docker tag is legal
* 4484ae4 [flutter_tool] Do not continue with a no-op 'upgrade'
responilla07 pushed a commit to responilla07/flutter that referenced this pull request Jun 8, 2020
* flutter/engine@6955b06 Cherry-picks for 1.12.13
  * flutter/engine@3e6d6bc add pointer data santizing in flutter web engine
* 09126ab Enable Android embedding v2 on the beta, dev and stable channel
* 4c95bbd Re-enable hostonly tests on non-master branches
* 066a992 Ensure that docker tag is legal
* 4484ae4 [flutter_tool] Do not continue with a no-op 'upgrade'
@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.

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

Development

Successfully merging this pull request may close these issues.

5 participants