Skip to content

Roll Flutter master to 7e30df2225 #9413

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

Merged
auto-submit merged 3 commits into from
Jun 10, 2025
Merged

Roll Flutter master to 7e30df2225 #9413

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf8e0d
Roll Flutter master to 7e30df2225
stuartmorgan-g Jun 10, 2025
0571109
Disable hot reload in web drive tests
stuartmorgan-g Jun 10, 2025
5788ce5
Remove the channel gate
stuartmorgan-g Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8b22f67c85114def3f090286c386627efdf59614
7e30df2225f65141e0227e424986311b79d39505
5 changes: 5 additions & 0 deletions script/tool/lib/src/drive_examples_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ class DriveExamplesCommand extends PackageLoopingCommand {
platformWeb: <String>[
'-d',
'web-server',
// TODO(stuartmorgan): Remove once drive works without it. See
// https://github.com/dart-lang/sdk/issues/60289 and
// https://github.com/flutter/flutter/pull/169174
if (platform.environment['CHANNEL']?.toLowerCase() == 'master')
'--no-web-experimental-hot-reload',

@mdebbar mdebbar Jun 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why the if?

@mdebbar mdebbar Jun 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, is this to omit the flag when running against stable? Did the flag not make it into stable yet?

@stuartmorgan-g stuartmorgan-g Jun 10, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I assumed it was recent (like the breakage) and hadn't, but I just checked the source and it looks like it's in 3.32. I'll remove the if.

'--web-port=7357',
'--browser-name=chrome',
if (useWasm) '--wasm',
Expand Down
9 changes: 9 additions & 0 deletions script/tool/test/drive_examples_command_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--screenshot=/path/to/logs/plugin_example-drive',
Expand Down Expand Up @@ -891,6 +892,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--wasm',
Expand Down Expand Up @@ -941,6 +943,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--screenshot=/path/to/logs/plugin_example-drive',
Expand Down Expand Up @@ -993,6 +996,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--chrome-binary=/path/to/chrome',
Expand Down Expand Up @@ -1444,6 +1448,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--screenshot=/path/to/logs/plugin_example-drive',
Expand All @@ -1459,6 +1464,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--screenshot=/path/to/logs/plugin_example-drive',
Expand Down Expand Up @@ -1558,6 +1564,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--screenshot=/path/to/logs/a_package_example-drive',
Expand Down Expand Up @@ -1603,6 +1610,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--driver',
Expand Down Expand Up @@ -1682,6 +1690,7 @@ void main() {
'drive',
'-d',
'web-server',
'--no-web-experimental-hot-reload',
'--web-port=7357',
'--browser-name=chrome',
'--screenshot=/path/to/logs/a_package_example_with_web-drive',
Expand Down