Skip to content

Conversation

@cyanglaz
Copy link
Contributor

@cyanglaz cyanglaz commented Aug 5, 2020

This is a cherry-pick of 004f90f and 2459f5c

Fixes #60215

In order to land this while passing CI, I also had to cherry-pick c9cd825

@flutter-dashboard flutter-dashboard bot changed the base branch from flutter-1.20-candidate.7 to master August 5, 2020 17:00
@flutter-dashboard flutter-dashboard bot requested a review from jmagman as a code owner August 5, 2020 17:00
@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.

1 similar comment
@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 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 Aug 5, 2020
@cyanglaz cyanglaz changed the base branch from master to flutter-1.20-candidate.7 August 5, 2020 17:00
@cyanglaz
Copy link
Contributor Author

cyanglaz commented Aug 5, 2020

@christopherfujino I experienced some git tag issue with my previous rebased, so I closed the other PR(#62939) you just reviewed in favor of this one. Could you give another review?

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

@cyanglaz
Copy link
Contributor Author

cyanglaz commented Aug 5, 2020

@pcsosinski The flutter version is not reported correctly so the tests are failing on versions again. #62994

Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

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

LGTM, confirmed it locally (unknown channel is because my git HEAD was detached to check out a PR commit):

Flutter 1.20.1-0.0.pre.2 • channel unknown • unknown source
Framework • revision 199983b4ff (16 minutes ago) • 2020-08-05 15:20:27 -0700
Engine • revision c8e3b94853
Tools • Dart 2.9.0

@cyanglaz cyanglaz requested a review from pcsosinski August 6, 2020 00:53
@cyanglaz
Copy link
Contributor Author

cyanglaz commented Aug 6, 2020

@pcsosinski CI has passed.

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 1.20, thanks @cyanglaz for getting this done and versioning fixed!

@cyanglaz cyanglaz merged commit 2ae3451 into flutter:flutter-1.20-candidate.7 Aug 6, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 6, 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.

flutter create -t plugin should not create no-op iOS folders in 1.20.0 stable release

4 participants