Skip to content

Stop running most Mac x64 builders that have Mac ARM equivalents on master#189301

Merged
auto-submit[bot] merged 2 commits into
flutter:masterfrom
jmagman:mac_x64
Jul 13, 2026
Merged

Stop running most Mac x64 builders that have Mac ARM equivalents on master#189301
auto-submit[bot] merged 2 commits into
flutter:masterfrom
jmagman:mac_x64

Conversation

@jmagman

@jmagman jmagman commented Jul 10, 2026

Copy link
Copy Markdown
Member

Per https://flutter.dev/go/macos-intel-deprecation we are turning down Intel-based Mac support. Stop running x64 tests in CI that already have ARM variants. The x64 Mac tests are very slow and therefore flaky so this will improve CI health as well.

Note: If we just deleted these builders, the beta and stable releases would fail since the builder config would be missing. Instead, stop running them on master. Once master is promoted to beta, we can remove enabled_branches: beta. And once that beta is promoted to stable, we won't want to run x64 anywhere, so we can delete the builders completely on all branches.

I left the Mac_x64 verify_binaries_codesigned and Mac_x64 verify_binaries_pre_codesigned since we likely want to keep those until we stop publishing those binaries.

First part of #189295
Fixes #188491 ("fixes")

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

@jmagman jmagman self-assigned this Jul 10, 2026
@jmagman jmagman added the CICD Run CI/CD label Jul 10, 2026
@jmagman jmagman changed the title Stop running most Mac x64 builders on master Stop running most Mac x64 builders that have Mac ARM equivalents on master Jul 10, 2026
@jmagman

jmagman commented Jul 10, 2026

Copy link
Copy Markdown
Member Author

That seemed to work, https://github.com/flutter/flutter/pull/189301/checks doesn't show Mac_x64 framework_tests_misc

@jmagman
jmagman marked this pull request as ready for review July 10, 2026 23:45

@gemini-code-assist gemini-code-assist Bot left a comment

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.

Code Review

This pull request updates .ci.yaml to restrict several Mac-based build and test targets to run only on the beta and stable branches, accompanied by TODO comments for their future removal. There are no review comments, and I have no additional feedback to provide.

eyebrowsoffire
eyebrowsoffire previously approved these changes Jul 11, 2026

@vashworth vashworth left a comment

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.

@jmagman

jmagman commented Jul 13, 2026

Copy link
Copy Markdown
Member Author

Can you also do:

Good call, I missed those.

@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 13, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Jul 13, 2026
Merged via the queue into flutter:master with commit 357c0b3 Jul 13, 2026
163 of 164 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 13, 2026
@jmagman
jmagman deleted the mac_x64 branch July 13, 2026 21:13
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Jul 14, 2026
flutter/flutter@cf9e8af...846664b

2026-07-14 [email protected] Roll Skia from dfcff99566c3 to 88954ef8f36d (1 revision) (flutter/flutter#189440)
2026-07-14 [email protected] refactor: remove material import from scrollable_semantics_test and selectable_region_context_menu_test (flutter/flutter#186611)
2026-07-14 [email protected] Roll Skia from 3d1fc554f1a2 to dfcff99566c3 (17 revisions) (flutter/flutter#189428)
2026-07-14 [email protected] Roll Dart SDK from 2c587df8f05a to 05bf153370c4 (5 revisions) (flutter/flutter#189426)
2026-07-14 [email protected] [flutter_tools] Remove web hot reload flag (flutter/flutter#185994)
2026-07-14 [email protected] [iOS] Fix flaky keyboard animation test (flutter/flutter#189353)
2026-07-14 [email protected] [Impeller] Playground expanded role (flutter/flutter#188889)
2026-07-14 [email protected] Roll pub packages (flutter/flutter#189409)
2026-07-13 [email protected] Update lock-threads dependency to 6.0.2 (flutter/flutter#189053)
2026-07-13 49699333+dependabot[bot]@users.noreply.github.com Bump actions/labeler from 6.1.0 to 6.2.0 in the all-github-actions group (flutter/flutter#189396)
2026-07-13 [email protected] Remove  outdated todo about `analysis bug on Windows` and update condition to also perform `analysis on windows` (flutter/flutter#189283)
2026-07-13 [email protected] Add more 0x0 size tests part 4 (flutter/flutter#185187)
2026-07-13 [email protected] Roll Packages from 20928d5 to ad2eab1 (18 revisions) (flutter/flutter#189387)
2026-07-13 [email protected] [flutter_tools] Fix ADB device listing output parsing regression (flutter/flutter#189369)
2026-07-13 [email protected] Stop running most Mac x64 builders that have Mac ARM equivalents on master (flutter/flutter#189301)
2026-07-13 [email protected] Move a few benchmarks from x64 Intel Macs to ARM (flutter/flutter#189377)
2026-07-13 [email protected] Add note that `hcpp` needs impeller (flutter/flutter#189382)
2026-07-13 [email protected] Roll Fuchsia Linux SDK from vhIlDkWIy21IrlB9E... to oOETA0ISPouDt2xBo... (flutter/flutter#189349)
2026-07-13 [email protected] [flutter_tools] Respect mustMatchAppBuild on Windows native assets (flutter/flutter#186788)
2026-07-13 [email protected] Roll Skia from 8bf65996caba to 3d1fc554f1a2 (2 revisions) (flutter/flutter#189350)
2026-07-13 [email protected] Roll Dart SDK from 0fc1668c4af4 to 2c587df8f05a (9 revisions) (flutter/flutter#189351)
2026-07-13 [email protected] [web] Fall back to full CJK fonts for characters not covered by split slices (flutter/flutter#188890)
2026-07-13 [email protected] Take Mac tool_integration_tests_* out of bringup (flutter/flutter#189368)
2026-07-13 [email protected] [hooks] Roll record_use to 1.0 and unpin (flutter/flutter#189366)

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] 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://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mac_x64_ios hot_mode_dev_cycle_ios__benchmark is 2.11% flaky

3 participants