Skip to content

Conversation

@Hixie
Copy link
Contributor

@Hixie Hixie commented May 18, 2023

Similar to #126972 but for master upgrades.

@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label May 18, 2023
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, but I'll leave final approval to @timsneath

@Hixie Hixie changed the title Suggest that people move to "beta" when they upgrade on "stable" Suggest that people move to "beta" when they upgrade on "master" May 19, 2023
Copy link
Contributor

@timsneath timsneath left a comment

Choose a reason for hiding this comment

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

A couple of textual comments, but otherwise I support merging this! Thank you ❤️

Copy link
Contributor

Choose a reason for hiding this comment

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

Is this technically true -- all the same testing? Technically, that can't be quite true, since a stable build has been tested in the beta channel prior to release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

how about "automated testing" instead of "thorough testing"?

I mean, right now it's true as written, as we basically don't have any usage of the beta channel. :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, that works. Or 'The "beta" channel also enjoys thorough testing, but...'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

k, changed to "automated testing"

Copy link
Contributor

Choose a reason for hiding this comment

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

As a casual reader, I didn't understand this statement. I thought main was the channel we wanted them to be on? https://github.com/flutter/flutter/wiki/Flutter-build-release-channels says, "We do not recommend using this branch unless you are contributing to Flutter."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

when you contribute to flutter/flutter you usually end up using a fork with our repo as upstream and your fork as origin (at least, that's what we currently recommended in the contributing docs). You still use the master branch as the development branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

The other approach that I've seen recommended is to clone from flutter/flutter and then have a downstream branch. But all-in-all, perhaps this whole sentence is a non-sequitur. Changing channels is orthogonal to setting up a development environment? The other problem about this sentence is that it conflates "contributing to Flutter" with "contributing a pull request to the flutter/flutter repo", which of course aren't the same thing.

Perhaps we should remove this sentence?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that's fair. I'll remove it.

@Hixie Hixie force-pushed the upgrade-master branch from 7ae5063 to 9f07b67 Compare May 22, 2023 20:16
@Hixie
Copy link
Contributor Author

Hixie commented May 22, 2023

PTAL

Copy link
Contributor

@timsneath timsneath left a comment

Choose a reason for hiding this comment

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

LGTM!

@timsneath timsneath merged commit 487ed57 into flutter:master May 22, 2023
@Hixie Hixie deleted the upgrade-master branch May 22, 2023 22:22
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 23, 2023
auto-submit bot pushed a commit to flutter/packages that referenced this pull request May 23, 2023
flutter/flutter@3437189...f86c529

2023-05-23 [email protected] Roll Flutter Engine from 431ed51c6415 to 168b0bf3f70d (1 revision) (flutter/flutter#127382)
2023-05-23 [email protected] Roll Flutter Engine from cc79ae858591 to 431ed51c6415 (1 revision) (flutter/flutter#127381)
2023-05-23 [email protected] Roll Flutter Engine from 311438399a45 to cc79ae858591 (1 revision) (flutter/flutter#127377)
2023-05-23 [email protected] Roll Flutter Engine from c284cd10e7ab to 311438399a45 (1 revision) (flutter/flutter#127376)
2023-05-23 [email protected] Roll Flutter Engine from 8d6602b030be to c284cd10e7ab (2 revisions) (flutter/flutter#127372)
2023-05-23 [email protected] Add M3 date picker tests and fix divider (flutter/flutter#127197)
2023-05-23 [email protected] Roll Flutter Engine from 2586cbeeae37 to 8d6602b030be (2 revisions) (flutter/flutter#127370)
2023-05-23 [email protected] Manual roll Flutter Engine from a342a9186e69 to 2586cbeeae37 (14 revisions) (flutter/flutter#127369)
2023-05-23 [email protected] [Android] Adds `namespace` to module build file templates (flutter/flutter#126963)
2023-05-23 [email protected] Revert Engine to a342a9186e69 (flutter/flutter#127368)
2023-05-23 [email protected] Roll Flutter Engine from 2a325eed77d0 to 41e8d52a006a (2 revisions) (flutter/flutter#127365)
2023-05-23 [email protected] Roll Flutter Engine from a342a9186e69 to 2a325eed77d0 (7 revisions) (flutter/flutter#127364)
2023-05-23 [email protected] Remove null-safety argument from DartPad doc samples (flutter/flutter#127345)
2023-05-22 [email protected] Support keeping a bottom sheet with a DraggableScrollableSheet from closing on drag/fling to min extent (flutter/flutter#127339)
2023-05-22 [email protected] Fix wasm-opt location when using local_web_sdk (flutter/flutter#127355)
2023-05-22 [email protected] Roll Flutter Engine from 1ed9fc0caf55 to a342a9186e69 (3 revisions) (flutter/flutter#127352)
2023-05-22 [email protected] Show warning when attempting to flutter run on an ios device with developer mode turned off (flutter/flutter#125710)
2023-05-22 [email protected] Suggest that people move to "beta" when they upgrade on "master" (flutter/flutter#127146)
2023-05-22 [email protected] add test for setting JAVA_HOME and PATH when invoking `sdkmanager --licenses` (flutter/flutter#127344)
2023-05-22 [email protected] Roll Flutter Engine from e04c14786d5a to 1ed9fc0caf55 (1 revision) (flutter/flutter#127343)
2023-05-22 [email protected] fix: Search anchor box location when used on nested navigator (flutter/flutter#127198)
2023-05-22 [email protected] [flutter_tools] delete entitlements files after copying to macos build dir (flutter/flutter#126875)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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.

3 participants