Skip to content

Allow macOS tests to use macOS 15 or 26 - #193317

Merged
auto-submit[bot] merged 6 commits into
flutter:masterfrom
vashworth:macos_15_or_26_v1
Sep 29, 2026
Merged

auto-submit[bot] merged 6 commits into
flutter:masterfrom
vashworth:macos_15_or_26_v1

Conversation

@vashworth

@vashworth vashworth commented Sep 24, 2026 •

Copy link
Copy Markdown
Contributor

Part of #192568

The following tests are kept on 15 due to failing testing. We will fix once we have macOS 26 bots in the try pool:

  • Mac framework_tests_libraries
  • Mac framework_tests_impeller
  • Mac framework_tests_widgets
  • Mac_build_test flutter_gallery__transition_perf_e2e_ios
  • Mac mac_unopt < ci/mac_release_arm64_tests
  • Linux linux_web_engine_tests < Mac run safari suites

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.

@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Sep 24, 2026
@flutter-dashboard

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@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 various CI configuration files to add support for macOS 26.6 (Mac-26.6) alongside macOS 15.7 (Mac-15.7) across multiple builders. Feedback indicates that the mac_unopt builder in mac_unopt.json should not be updated to run on macOS 26.6, and a suggestion is provided to revert this change to keep it restricted to macOS 15.7.

Comment thread engine/src/flutter/ci/builders/mac_unopt.json
@github-actions github-actions Bot added the engine flutter/engine related. See also e: labels. label Sep 24, 2026
@vashworth vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 28, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Sep 28, 2026
Merged via the queue into flutter:master with commit 4d8bbce Sep 29, 2026
23 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 29, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Sep 29, 2026
flutter/flutter@c5a061b...55b8f88

2026-09-29 [email protected] [Android 17] Added Android 17 device to Firebase tests (flutter/flutter#193251)
2026-09-29 [email protected] [engine] Fix remaining `unawaited_futures` lints (flutter/flutter#193508)
2026-09-29 [email protected] shell: Rename first-frame tests AddFirstFrameCallback* (flutter/flutter#193418)
2026-09-28 [email protected] Enable `unawaited_futures` lint across the Flutter repository (flutter/flutter#193125)
2026-09-28 [email protected] Upgrade flutter/flutter to Roblectric 4.17 (flutter/flutter#193369)
2026-09-28 [email protected] [engine] Decode animation frames with alpha after an opaque first frame (flutter/flutter#193113)
2026-09-28 [email protected] Allow macOS tests to use macOS 15 or 26 (flutter/flutter#193317)
2026-09-28 [email protected] Cleanup DDC SDK build targets (flutter/flutter#193193)

If this roll has caused a breakage, revert this CL and set the roller
to dry run mode 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
kevmoo added a commit to kevmoo/flutter that referenced this pull request Oct 1, 2026
Use 2-part Major.Minor `Mac-26.6` in `generate_builder_json.dart` and `linux_web_engine_test.json` to match `.ci.yaml` and `engine/src/flutter/ci/builders/*.json` from flutter#193317.
bkonyi pushed a commit to bkonyi/flutter that referenced this pull request Oct 5, 2026
This switches the Safari Web engine CI suites (`Mac run safari suites`)
to run on `Mac-26.6` LUCI bots (matching the `Mac-26.6` dimension
convention in flutter#193317) and enables the 4 WasmGC / Skwasm Safari suites
now that Safari 26 (with Wasm `js-string` builtins) ships on macOS
26.6.2 bots (flutter#192559 / flutter#192572):

- `safari-dart2wasm-canvaskit-engine`
- `safari-dart2wasm-skwasm-ui`
- `safari-coi-dart2wasm-skwasm-ui`
- `safari-coi-dart2wasm-skwasm-skwasm`

### Safari 26 & WebDriver Focus Test Updates

Running `Mac run safari suites` on `Mac-26.6` exposed two Safari 26 CSS
`outline` serialization differences and one test that depended on
`Safari.app` holding macOS WindowServer foreground focus under
`safaridriver`:

1. **`text_editing_test.dart` (`text editing styles invisible
element`)**: Safari 26 serializes inline `outline: none` on
`input.style.outline` as `'medium'` (matching `input.style.border`
immediately below it).
2. **`view_embedder/style_manager_test.dart` (`attachGlobalStyles hides
the outline when focused`)**: Safari 26 serializes
`getComputedStyle(element).outline` in canonical CSSOM order (`'0px none
rgb(0, 0, 0)'` instead of `'rgb(0, 0, 0) none 0px'`). Additionally, in
WebKit `:focus` only matches when `domDocument.hasFocus()` is `true`;
when `Safari.app` is not the frontmost macOS WindowServer app
(`!domDocument.hasFocus()`), WebKit returns the unfocused initial
outline (`'3px none rgb(0, 0, 0)'`).
3. **`platform_dispatcher/view_focus_binding.dart` &
`view_focus_binding_test.dart` (`works even if focus is changed in the
middle of a blur call`)**: Use `_documentHasFocus` (introduced in
flutter#190942 for `debugViewFocusDocumentHasFocusOverride`) in
`ViewFocusBinding._handleFocusout` (`wasFocusInvoked`) and set
`debugViewFocusDocumentHasFocusOverride = true` in the test so it does
not flake when the `safaridriver` window is unfocused in WindowServer.

Fixes flutter#193833
Fixes flutter#193834
Part of flutter#192559
Part of flutter#192572
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD engine flutter/engine related. See also e: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants