Skip to content

[flutter_releases] Flutter 1.22.2 framework cherrypicks#68135

Merged
christopherfujino merged 4 commits intoflutter:flutter-1.22-candidate.12from
chris-forks:cherrypicks-flutter-1.22-candidate.12
Oct 15, 2020
Merged

[flutter_releases] Flutter 1.22.2 framework cherrypicks#68135
christopherfujino merged 4 commits intoflutter:flutter-1.22-candidate.12from
chris-forks:cherrypicks-flutter-1.22-candidate.12

Conversation

@christopherfujino
Copy link
Contributor

@christopherfujino christopherfujino commented Oct 14, 2020 •
edited
Loading

Previous branch build

Scheduled Cherrypicks

Test-only Fixes

  • Pinned customer_testing on cirrus, and added Windows version (LUCI versions listed under known failures)

Known Pre-submit Failures

  • LUCI customer_testing depends on a script in the recipes repo that clones customer_testing from HEAD. Cirrus customer_testing tests have been pinned and are passing.
  • build_tests-1_last-macos running out of disk space
  • all windows + cirrus tests failing to pub upgrade Cirrus Windows tests failing to pub upgrade #68250

Known Post-submit Failures

  • build_gallery mac failing due to missing ruby dependency luci log.
  • Linux beta web_e2e_test failing because this test shard was added after this release was branched PR introducing test.
  • LUCI customer_testings tests again failing (see above).

Jonah Williams added 2 commits October 14, 2020 13:11
@christopherfujino
[flutter_tools] support Android Studio 4.1 on Windows (flutter#67992)
b080542 
Android Studio 4.1 moved the location of the .home file on Windows which is used to located the install directory. This functionality is important because it is how we locate and discover the Android SDK functionality, as well as the appropriate JRE.

fixes flutter#67986
@christopherfujino
[gestures] make stylus pointer types use touch pan/drag slop (flutter…
a434945 
…#67885)
@flutter-dashboard flutter-dashboard bot changed the base branch from flutter-1.22-candidate.12 to master October 14, 2020 20:15
@flutter-dashboard
Copy link

flutter-dashboard bot commented Oct 14, 2020

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.22-candidate.12. 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.

@google-cla google-cla bot added the cla: yes label Oct 14, 2020
@flutter-dashboard flutter-dashboard bot added a: tests "flutter test", flutter_test, or one of our tests engine flutter/engine related. See also e: labels. f: cupertino flutter/packages/flutter/cupertino repository f: material design flutter/packages/flutter/material repository. 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. work in progress; do not review labels Oct 14, 2020
@christopherfujino christopherfujino changed the base branch from master to flutter-1.22-candidate.12 October 14, 2020 20:15
jonahwilliams
jonahwilliams approved these changes Oct 14, 2020
View reviewed changes
Copy link
Contributor

@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

@christopherfujino christopherfujino marked this pull request as ready for review October 15, 2020 17:30
@christopherfujino christopherfujino merged commit 84f3d28 into flutter:flutter-1.22-candidate.12 Oct 15, 2020
@christopherfujino christopherfujino deleted the cherrypicks-flutter-1.22-candidate.12 branch October 15, 2020 23:26
@AlexV525 AlexV525 mentioned this pull request Oct 16, 2020
Closed
@christopherfujino christopherfujino mentioned this pull request Oct 28, 2020
Merged
Luizgpp added a commit to Luizgpp/flutter that referenced this pull request Oct 30, 2020
@Luizgpp
[flutter_releases] Flutter 1.22.2 framework cherrypicks (flutter#68135)
9c08b37 
* [flutter_tools] support Android Studio 4.1 on Windows (flutter#67992)

Android Studio 4.1 moved the location of the .home file on Windows which is used to located the install directory. This functionality is important because it is how we locate and discover the Android SDK functionality, as well as the appropriate JRE.

fixes flutter#67986

* [gestures] make stylus pointer types use touch pan/drag slop (flutter#67885)

* Update engine cherrypicks

* pin customer_testing and add back windows to cirrus

Co-authored-by: Jonah Williams <[email protected]>
@iapicca iapicca mentioned this pull request Jan 8, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jonahwilliams jonahwilliams jonahwilliams approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: tests "flutter test", flutter_test, or one of our tests c: contributor-productivity Team-specific productivity, code health, technical debt. engine flutter/engine related. See also e: labels. f: cupertino flutter/packages/flutter/cupertino repository f: material design flutter/packages/flutter/material repository. 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.

2 participants

@christopherfujino @jonahwilliams