From a3e9379a87eaaa8e141ac0f7ede8a5db1bd2ee77 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> Date: Wed, 7 May 2025 10:14:08 -0500 Subject: [PATCH] Allow iOS devicelab tests to run on macOS 15.1 (#168234) New devicelab bots were added to the pools: https://github.com/flutter/flutter/issues/163002. However, they are on macOS 15.1. Allow these bots to be used by allowing macOS 15 to be used. Specifying macOS 15.1 specifically because we plan to upgrade to newer version of macOS 15 in the future: https://github.com/flutter/flutter/issues/167676 I verified all bots are good to go: - [x] [flutter-devicelab-mac-50](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-50) - https://ci.chromium.org/b/8715949123404093697 - [x] [flutter-devicelab-mac-51](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-51) - https://ci.chromium.org/b/8715948996142121377 - [x] [flutter-devicelab-mac-52](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-52) - https://ci.chromium.org/b/8715948941926665041 - [x] [flutter-devicelab-mac-53](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-53) - https://ci.chromium.org/b/8715948864280336145 - [x] [flutter-devicelab-mac-54](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-54) - https://ci.chromium.org/b/8715944668313575425 - [x] [flutter-devicelab-mac-55](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-55) - https://ci.chromium.org/b/8715948803357927393 - [x] [flutter-devicelab-mac-56](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-56) - https://ci.chromium.org/b/8715943235735747409 - [x] [flutter-devicelab-mac-57](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-57) - https://ci.chromium.org/b/8715702195501017153 - [x] [flutter-devicelab-mac-58](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-58) - https://ci.chromium.org/b/8715702188356676017 - [x] [flutter-devicelab-mac-59](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-59) - https://ci.chromium.org/b/8715702172189573265 - [x] [flutter-devicelab-mac-60](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-60) - https://ci.chromium.org/b/8715702160439712753 - [x] [flutter-devicelab-mac-61](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-61) - https://ci.chromium.org/b/8715702148815570433 - [x] [flutter-devicelab-mac-62](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-62) - https://ci.chromium.org/b/8715702138014731537 - [x] [flutter-devicelab-mac-63](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-63) - https://ci.chromium.org/b/8715948441393524945 - [x] [flutter-devicelab-mac-64](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-64) - https://ci.chromium.org/b/8715702120175999281 - [x] [flutter-devicelab-mac-65](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-65) - https://ci.chromium.org/b/8715702108188863617 - [x] [flutter-devicelab-mac-66](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-66) - https://ci.chromium.org/b/8715688828119260401 - [x] [flutter-devicelab-mac-67](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-67) - https://ci.chromium.org/b/8715702082037082849 - [x] [flutter-devicelab-mac-68](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-68) - https://ci.chromium.org/b/8715702070384265201 - [x] [flutter-devicelab-mac-69](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-69) - https://ci.chromium.org/b/8715702058744115521 - [x] [flutter-devicelab-mac-70](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-70) - https://ci.chromium.org/b/8715702046612264657 - [x] [flutter-devicelab-mac-71](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-71) - https://ci.chromium.org/b/8715702036987261777 - [x] [flutter-devicelab-mac-72](https://chromium-swarm.appspot.com/bot?id=flutter-devicelab-mac-72) - https://ci.chromium.org/b/8715688823094725361 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [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]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [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]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [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 [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 --- .ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index a8504f0e029..b0295584eb9 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -284,7 +284,7 @@ platform_properties: {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "version:to_2025"} ] - os: Mac-14 + os: Mac-14|Mac-15.1 device_os: iOS-17|iOS-18 $flutter/osx_sdk : >- { @@ -301,7 +301,7 @@ platform_properties: {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "version:to_2025"} ] - os: Mac-14 + os: Mac-14|Mac-15.1 cpu: x86 device_os: iOS-17|iOS-18 $flutter/osx_sdk : >- @@ -319,7 +319,7 @@ platform_properties: {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "none"} ] - os: Mac-14 + os: Mac-14|Mac-15.1 cpu: arm64 device_os: iOS-17|iOS-18 $flutter/osx_sdk : >-