Skip to content

Reverts "Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator (#185431)" - #185513

Merged
cbracken merged 1 commit into
masterfrom
revert_de9436d4e67115bfda75466cf593b4a6e991361a
Apr 24, 2026
Merged

cbracken merged 1 commit into
masterfrom
revert_de9436d4e67115bfda75466cf593b4a6e991361a

Conversation

@auto-submit

@auto-submit auto-submit Bot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

Reverts: #185431

Initiated by: cbracken

Reason for reverting: platform view test failures #185510

Original PR Author: okorohelijah

Reviewed By: {vashworth}

This change reverts the following previous change:
Updates Xcode SDK version from 16c5032a to 17c52 (Xcode 26.2), macOS host from Mac-15.5|Mac-15.7 to Mac-15.7, and simulator runtime from ios-18-2 to ios-26-2. Replaces 18.2 golden images with 26.2 goldens and updates generate_builder_json.dart.

device_os remains iOS-18 for devicelab targets (physical devices not yet upgraded).

Fixes #172855

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

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.

@auto-submit auto-submit Bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Apr 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.

@github-actions github-actions Bot added a: text input Entering text in a text field or keyboard related problems engine flutter/engine related. See also e: labels. platform-web Web applications specifically labels Apr 24, 2026
@auto-submit auto-submit Bot removed the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Apr 24, 2026
@auto-submit

auto-submit Bot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor Author

auto label is removed for flutter/flutter/185513, Failed to enqueue flutter/flutter/185513 with HTTP 400: Pull request Required status check "Merge Queue Guard" is expected..

@cbracken cbracken added the CICD Run CI/CD label Apr 24, 2026
@cbracken
cbracken enabled auto-merge April 24, 2026 02:34
@cbracken cbracken added the emergency Jump the queue; land PR in front of all others; only use for emergencies label Apr 24, 2026
@flutter-dashboard

Copy link
Copy Markdown

Detected the emergency label.

If you add the autosubmit label, the bot will wait until all presubmits pass but ignore the tree status, allowing fixes for tree breakages while still validating that they don't break any existing presubmits.

The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue".

@cbracken
cbracken added this pull request to the merge queue Apr 24, 2026
Merged via the queue into master with commit c6c4a4a Apr 24, 2026
117 of 211 checks passed
@cbracken
cbracken deleted the revert_de9436d4e67115bfda75466cf593b4a6e991361a branch April 24, 2026 03:07
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Apr 24, 2026
Roll Flutter from 5e4f16931847 to aeb96234de86 (42 revisions)

flutter/flutter@5e4f169...aeb9623

2026-04-24 [email protected] Fix leak on error case (flutter/flutter#185516)
2026-04-24 [email protected] Roll Skia from 04c6c369cfd0 to 1c9b0b9141e9 (2 revisions) (flutter/flutter#185529)
2026-04-24 [email protected] Roll Dart SDK from f386b11262f6 to c26627715892 (1 revision) (flutter/flutter#185526)
2026-04-24 [email protected] Roll Skia from 290a056fcd0e to 04c6c369cfd0 (2 revisions) (flutter/flutter#185525)
2026-04-24 [email protected] [ios] Extract SplashScreenManager from FlutterViewController (flutter/flutter#185405)
2026-04-24 [email protected] Roll Fuchsia Linux SDK from j3UCWZhWx7zSl9Asy... to 9fPnyEo9PaNdXtasl... (flutter/flutter#185523)
2026-04-24 [email protected] Roll Skia from 4c8bedd3c932 to 290a056fcd0e (1 revision) (flutter/flutter#185518)
2026-04-24 [email protected] Roll Dart SDK from 70665fc3fd2e to f386b11262f6 (2 revisions) (flutter/flutter#185512)
2026-04-24 [email protected] Handle hairline strokes in UberSDF (flutter/flutter#184895)
2026-04-24 [email protected] Roll Skia from ea20c73ac72c to 4c8bedd3c932 (3 revisions) (flutter/flutter#185509)
2026-04-24 [email protected] Use relative path for reloadedSourcesUri and reloaded modules (flutter/flutter#184598)
2026-04-24 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator (#185431)" (flutter/flutter#185513)
2026-04-24 [email protected] Roll Skia from e8d00d634c22 to ea20c73ac72c (8 revisions) (flutter/flutter#185500)
2026-04-23 [email protected] Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator (flutter/flutter#185431)
2026-04-23 [email protected] update team-text-input pr triage link to filter out "waiting for response" label (flutter/flutter#185499)
2026-04-23 [email protected] Check for overflow when computing the pixel buffer size for an animated PNG frame (flutter/flutter#185442)
2026-04-23 [email protected] Impeller: Recreate Vulkan transients on surface size change (flutter/flutter#185122)
2026-04-23 [email protected] Updating the windowing API for sized to content regular and dialog windows + removing the decorated flag (flutter/flutter#184977)
2026-04-23 [email protected] Roll Dart SDK from 634991935e9a to 70665fc3fd2e (2 revisions) (flutter/flutter#185488)
2026-04-23 [email protected] Updating ios triage link (flutter/flutter#185437)
2026-04-23 [email protected] Revert "Preprovision Android NDK for flavored builds and reuse matchi… (flutter/flutter#185439)
2026-04-23 [email protected] fix(web): Fix LateInitializationError in CkSurface and SkwasmSurface (flutter/flutter#185116)
2026-04-23 [email protected] [web] Implement stepped image downscaling for CanvasKit and Skwasm (flutter/flutter#184741)
2026-04-23 [email protected] Made wide_gamut_macos only run on arm64 machines (flutter/flutter#185486)
2026-04-23 [email protected] [ios] Update documentation for FlutterAppDelegate.pluginRegistrant (flutter/flutter#185201)
2026-04-23 [email protected] Roll Dart SDK from bdf48933f3cf to 634991935e9a (1 revision) (flutter/flutter#185462)
2026-04-23 [email protected] Roll Skia from 5fe6162546b1 to e8d00d634c22 (3 revisions) (flutter/flutter#185459)
2026-04-23 [email protected] Roll Skia from 0049c5d91b08 to 5fe6162546b1 (1 revision) (flutter/flutter#185455)
2026-04-23 [email protected] Roll Dart SDK from 9648f446f131 to bdf48933f3cf (19 revisions) (flutter/flutter#185451)
2026-04-23 [email protected] Roll Skia from 11640d1cbc5c to 0049c5d91b08 (11 revisions) (flutter/flutter#185453)
2026-04-23 [email protected] Add disposal guidance to CurvedAnimation and CurveTween docs (flutter/flutter#184569)
2026-04-23 [email protected] Add `clipBehavior` parameter to `AnimatedCrossFade` (flutter/flutter#184545)
2026-04-23 [email protected] [fuchsia] Ask for only VMEX, not ambient-replace-as-executable. (flutter/flutter#185099)
2026-04-23 [email protected] Unify SemanticUpdateBuilder API for web and non-web (flutter/flutter#185433)
2026-04-22 [email protected] Fix ImageInfo.isCloneOf tests by moving async work to setUp (flutter/flutter#185254)
2026-04-22 [email protected] Roll Fuchsia Linux SDK from UdpQnaP5eSaDZd3-i... to j3UCWZhWx7zSl9Asy... (flutter/flutter#185438)
2026-04-22 [email protected] Adds script to run malioc locally (flutter/flutter#185371)
2026-04-22 [email protected] Add await mechanism to setClipboard in android_semantics_integration test (flutter/flutter#185428)
2026-04-22 [email protected] Add ability to pass flags to `et run` (flutter/flutter#185109)
2026-04-22 [email protected] Add more guidelines for code review bot (flutter/flutter#185367)
2026-04-22 [email protected] Roll pub packages (flutter/flutter#185274)
2026-04-22 [email protected] Fix incorrect scale parameter reference in Image constructor docs (flutter/flutter#185403)

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
...
@okorohelijah

Copy link
Copy Markdown
Contributor

reason for revert: fixed #185548

@okorohelijah okorohelijah added the revert Autorevert PR (with "Reason for revert:" comment) label Apr 25, 2026
@auto-submit

auto-submit Bot commented Apr 25, 2026

Copy link
Copy Markdown
Contributor Author

Time to revert pull request flutter/flutter/185513 has elapsed.
You need to open the revert manually and process as a regular pull request.

@auto-submit auto-submit Bot removed the revert Autorevert PR (with "Reason for revert:" comment) label Apr 25, 2026
creatorpiyush pushed a commit to creatorpiyush/packages that referenced this pull request Jun 10, 2026
…r#11576)

Roll Flutter from 5e4f16931847 to aeb96234de86 (42 revisions)

flutter/flutter@5e4f169...aeb9623

2026-04-24 [email protected] Fix leak on error case (flutter/flutter#185516)
2026-04-24 [email protected] Roll Skia from 04c6c369cfd0 to 1c9b0b9141e9 (2 revisions) (flutter/flutter#185529)
2026-04-24 [email protected] Roll Dart SDK from f386b11262f6 to c26627715892 (1 revision) (flutter/flutter#185526)
2026-04-24 [email protected] Roll Skia from 290a056fcd0e to 04c6c369cfd0 (2 revisions) (flutter/flutter#185525)
2026-04-24 [email protected] [ios] Extract SplashScreenManager from FlutterViewController (flutter/flutter#185405)
2026-04-24 [email protected] Roll Fuchsia Linux SDK from j3UCWZhWx7zSl9Asy... to 9fPnyEo9PaNdXtasl... (flutter/flutter#185523)
2026-04-24 [email protected] Roll Skia from 4c8bedd3c932 to 290a056fcd0e (1 revision) (flutter/flutter#185518)
2026-04-24 [email protected] Roll Dart SDK from 70665fc3fd2e to f386b11262f6 (2 revisions) (flutter/flutter#185512)
2026-04-24 [email protected] Handle hairline strokes in UberSDF (flutter/flutter#184895)
2026-04-24 [email protected] Roll Skia from ea20c73ac72c to 4c8bedd3c932 (3 revisions) (flutter/flutter#185509)
2026-04-24 [email protected] Use relative path for reloadedSourcesUri and reloaded modules (flutter/flutter#184598)
2026-04-24 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator (#185431)" (flutter/flutter#185513)
2026-04-24 [email protected] Roll Skia from e8d00d634c22 to ea20c73ac72c (8 revisions) (flutter/flutter#185500)
2026-04-23 [email protected] Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator (flutter/flutter#185431)
2026-04-23 [email protected] update team-text-input pr triage link to filter out "waiting for response" label (flutter/flutter#185499)
2026-04-23 [email protected] Check for overflow when computing the pixel buffer size for an animated PNG frame (flutter/flutter#185442)
2026-04-23 [email protected] Impeller: Recreate Vulkan transients on surface size change (flutter/flutter#185122)
2026-04-23 [email protected] Updating the windowing API for sized to content regular and dialog windows + removing the decorated flag (flutter/flutter#184977)
2026-04-23 [email protected] Roll Dart SDK from 634991935e9a to 70665fc3fd2e (2 revisions) (flutter/flutter#185488)
2026-04-23 [email protected] Updating ios triage link (flutter/flutter#185437)
2026-04-23 [email protected] Revert "Preprovision Android NDK for flavored builds and reuse matchi… (flutter/flutter#185439)
2026-04-23 [email protected] fix(web): Fix LateInitializationError in CkSurface and SkwasmSurface (flutter/flutter#185116)
2026-04-23 [email protected] [web] Implement stepped image downscaling for CanvasKit and Skwasm (flutter/flutter#184741)
2026-04-23 [email protected] Made wide_gamut_macos only run on arm64 machines (flutter/flutter#185486)
2026-04-23 [email protected] [ios] Update documentation for FlutterAppDelegate.pluginRegistrant (flutter/flutter#185201)
2026-04-23 [email protected] Roll Dart SDK from bdf48933f3cf to 634991935e9a (1 revision) (flutter/flutter#185462)
2026-04-23 [email protected] Roll Skia from 5fe6162546b1 to e8d00d634c22 (3 revisions) (flutter/flutter#185459)
2026-04-23 [email protected] Roll Skia from 0049c5d91b08 to 5fe6162546b1 (1 revision) (flutter/flutter#185455)
2026-04-23 [email protected] Roll Dart SDK from 9648f446f131 to bdf48933f3cf (19 revisions) (flutter/flutter#185451)
2026-04-23 [email protected] Roll Skia from 11640d1cbc5c to 0049c5d91b08 (11 revisions) (flutter/flutter#185453)
2026-04-23 [email protected] Add disposal guidance to CurvedAnimation and CurveTween docs (flutter/flutter#184569)
2026-04-23 [email protected] Add `clipBehavior` parameter to `AnimatedCrossFade` (flutter/flutter#184545)
2026-04-23 [email protected] [fuchsia] Ask for only VMEX, not ambient-replace-as-executable. (flutter/flutter#185099)
2026-04-23 [email protected] Unify SemanticUpdateBuilder API for web and non-web (flutter/flutter#185433)
2026-04-22 [email protected] Fix ImageInfo.isCloneOf tests by moving async work to setUp (flutter/flutter#185254)
2026-04-22 [email protected] Roll Fuchsia Linux SDK from UdpQnaP5eSaDZd3-i... to j3UCWZhWx7zSl9Asy... (flutter/flutter#185438)
2026-04-22 [email protected] Adds script to run malioc locally (flutter/flutter#185371)
2026-04-22 [email protected] Add await mechanism to setClipboard in android_semantics_integration test (flutter/flutter#185428)
2026-04-22 [email protected] Add ability to pass flags to `et run` (flutter/flutter#185109)
2026-04-22 [email protected] Add more guidelines for code review bot (flutter/flutter#185367)
2026-04-22 [email protected] Roll pub packages (flutter/flutter#185274)
2026-04-22 [email protected] Fix incorrect scale parameter reference in Image constructor docs (flutter/flutter#185403)

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
...
Piinks pushed a commit to Piinks/flutter that referenced this pull request Nov 5, 2026
…are caught in presubmit (flutter#192985)

`dev/benchmarks/platform_views_layout` is only ever built by post-submit
devicelab benchmarks (`Mac_ios platform_views_scroll_perf_*` and
`Linux_pixel_7pro`/`Linux_mokey platform_views_scroll_perf*`). It is
also the only app in the repo that depends on the `google_mobile_ads`
plugin, so a change that breaks native plugin integration for that app
is invisible to presubmit.

That is exactly what happened with flutter#185431 (Xcode 26.2 / iOS 26 CI
upgrade): the `GoogleMobileAds` xcframework failed to link (missing
`__swift_FORCE_LOAD_$_swiftCompatibility*` and libc++ symbols) only in
the post-submit `Mac_ios platform_views_scroll_perf_*` devicelab tasks
(flutter#185510), and the PR had to be reverted (flutter#185513) before being fixed by
enabling SwiftPM for the plugin (flutter#185548). Building this app in the
`build_tests` shard would have surfaced the failure on the presubmit
`Mac_arm64 build_tests_*` builders instead.

This PR adds the directory to `exampleDirectories` in `_runBuildTests`
(`dev/bots/test.dart`). `_runExampleProjectBuildTests` only builds
platforms whose project folder exists, so concretely this adds:

| Host | Commands added |
|---|---|
| Linux / Mac / Windows `build_tests_*` | `flutter build apk --debug
-v`, `flutter build apk --release -v` |
| Mac `build_tests_*` only | `flutter build ios --no-codesign --debug
-v`, `flutter build ios --no-codesign --release -v` |

No web / macOS / Linux / Windows desktop build is attempted (the app has
no such folders, and the shard prints e.g. `has no linux directory,
skipping Linux` — verified with `--dry-run`).

Sub-sharding is `{index}_{total}` driven by the `SUBSHARD` env var and
the test list is shuffled with a fixed seed, so **no `.ci.yaml` change
is needed**. The `build_tests` test count goes from 27 → 28 across 5
subshards (Linux/Mac) and 9 (Windows); the new entry lands in `4_5` on
Linux with the current seed.



**_With the help of Gemini_**

Fixes flutter#185538

## 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.
- [ ] I updated/added relevant in-code documentation (doc comments with
`///`). *(N/A — added an inline `//` comment explaining why the entry
exists; no public API touched.)*
- [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). *(Verified none is needed — CI-only change.)*
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt]. *(**test-exempt**: this is a CI configuration change to
`dev/bots/test.dart`; the change is exercised directly by the
`Linux/Mac/Windows build_tests_*` presubmit builders on this very PR.)*
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported. *(Not a breaking change.)*
- [ ] All existing and new tests are passing. *(Pending CI — see
"Verification" below for what was run locally.)*


<!-- 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/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
[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

Co-authored-by: Victoria Ashworth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: text input Entering text in a text field or keyboard related problems CICD Run CI/CD emergency Jump the queue; land PR in front of all others; only use for emergencies engine flutter/engine related. See also e: labels. platform-web Web applications specifically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator

3 participants