Skip to content

[CP-beta]Run the mac_unopt sub-builds as standalone builders - #196058

Merged
auto-submit[bot] merged 2 commits into
flutter:flutter-3.50-candidate.0from
flutteractionsbot:cp-beta-e9efa32eee75fe655dad6b4cf95f2531adaf2669
Nov 5, 2026
Merged

auto-submit[bot] merged 2 commits into
flutter:flutter-3.50-candidate.0from
flutteractionsbot:cp-beta-e9efa32eee75fe655dad6b4cf95f2531adaf2669

Conversation

@flutteractionsbot

@flutteractionsbot flutteractionsbot commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

This pull request is created by automatic cherry pick workflow
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.

Issue Link:

#186462

2 PRs: #195868 and #196027

Impact Description:

Release builders should match the master branch configs. Without this change, the beta release branch will try to run the old builder names and fail because the infra config is missing.

Changelog Description:

N/A - CI test-only change

Workaround:

N/A

Risk:

What is the risk level of this cherry-pick?

  • Low
  • Medium
  • High

Test Coverage:

Are you confident that your fix is well-tested by automated tests?

  • Yes
  • No

Validation Steps:

Release PRs should not complain about missing builders.

`Mac mac_unopt` is an orchestrator. It schedules 8 Mac sub-builds, and
holds a Mac bot for the 43 minutes they take.

Instead, this PR moves each sub-build to a top-level engine_v2/builder
target, which is how `windows_unopt` has run since
flutter-team-archive/engine#41785. The build definitions are
copied unchanged into ci/builders/standalone/.

The new targets start in bringup and a follow-up PR will delete Mac
mac_unopt and mac_unopt.json.

With this change each builder will have its own history on the
dashboard, so a failure shows which build broke rather than "mac_unopt".
When one flakes, only that one reruns, ditto suppressions. When there's
a flake it will be much easier to spelunk into the logs to figure out
what's happening (see flutter#185908).

The orchestrator's bot goes away (around ~300 Mac bot-hours / wk).
Unfortunately wall time doesn't change because the sub-builds were
already running in parallel (though it should be easier to make changes
in the future that improve wall time). This will also add 8 new squares
to the dashboard. Will also need release branch cherry-picks to get the
infra configs to match.

This shouldn't impact building/uploading engine binaries or anything in
the merge queue (afaik).

Additional history:

- Orchestrator created:
flutter-team-archive/engine#40860
- Orchestrator moved to Linux to save a Mac builder:
flutter-team-archive/engine#41184 and
flutter-team-archive/engine#41226
- Moved back to Mac: flutter-team-archive/engine#50863 (for
flutter#142010) because the name was
confusing

Part of  flutter#155041
Part of flutter#186462


## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [AI contribution guidelines] and understand my
responsibilities, or I am not using AI tools.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant in-code documentation (doc comments with
`///`).
- [x] If this PR introduces a new feature or capability, I created and
linked a website documentation issue or PR in [flutter/website] (or
verified none is needed).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

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](https://developers.google.com/gemini-code-assist/docs/review-github-code).
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.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[AI contribution guidelines]:
https://github.com/flutter/flutter/blob/main/CONTRIBUTING.ai.md
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[flutter/website]: https://github.com/flutter/website
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
@flutteractionsbot flutteractionsbot added the cp: review Cherry-picks in the review queue label Nov 5, 2026
@flutteractionsbot

Copy link
Copy Markdown
Contributor Author

@jmagman please fill out the PR description above, afterwards the release team will review this request.

@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Nov 5, 2026
@flutter-dashboard

Copy link
Copy Markdown

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@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 adds several macOS arm64 builder configurations to .ci.yaml and introduces corresponding JSON configuration files for standalone builders. The review feedback identifies multiple typos in the configuration files, specifically invalid macOS versions ('Mac-26.6') and non-existent iOS SDK and runtime versions ('17c52' and 'ios-26-2_17c52') which should be corrected to valid standard versions.

Comment thread engine/src/flutter/.ci.yaml Resolved
Comment thread engine/src/flutter/.ci.yaml Resolved
@github-actions github-actions Bot added the engine flutter/engine related. See also e: labels. label Nov 5, 2026
The standalone builders added in flutter#195868 are passing in post-submit.
Remove bringup from them and delete the old mac_unopt orchestrator
builder and its config. Update docs that referenced mac_unopt.json.

(cherry picked from commit 84d0eb2)
@github-actions github-actions Bot added team-infra Owned by Infrastructure team d: docs/ flutter/flutter/docs, for contributors labels Nov 5, 2026
@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 5, 2026
@auto-submit
auto-submit Bot merged commit d7ec6a1 into flutter:flutter-3.50-candidate.0 Nov 5, 2026
9 checks passed
@flutteractionsbot
flutteractionsbot deleted the cp-beta-e9efa32eee75fe655dad6b4cf95f2531adaf2669 branch November 5, 2026 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD cp: review Cherry-picks in the review queue d: docs/ flutter/flutter/docs, for contributors engine flutter/engine related. See also e: labels. team-infra Owned by Infrastructure team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants