Run tests on either macOS 14 or 15 (#171076)

In preparation of upgrading the remaining bots to macOS 15, allow tests
to use any version of macOS 14 or 15.

## 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].
- [x] 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].

<!-- Links -->
[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
This commit is contained in:
Victoria Ashworth 2025-07-11 13:21:08 -05:00 committed by GitHub
parent 43161d4b95
commit 23b81a714d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 90 additions and 90 deletions

View File

@ -157,7 +157,7 @@ platform_properties:
[
{"dependency": "apple_signing", "version": "version:to_2025"}
]
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
device_type: none
$flutter/osx_sdk : >-
{
@ -174,7 +174,7 @@ platform_properties:
[
{"dependency": "apple_signing", "version": "version:to_2025"}
]
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
device_type: none
cpu: arm64
$flutter/osx_sdk : >-
@ -194,7 +194,7 @@ platform_properties:
]
device_type: none
mac_model: "Macmini8,1"
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
tags: >
["devicelab", "hostonly", "mac"]
$flutter/osx_sdk : >-
@ -212,7 +212,7 @@ platform_properties:
[
{"dependency": "apple_signing", "version": "version:to_2025"}
]
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
device_type: none
cpu: x86
$flutter/osx_sdk : >-
@ -231,7 +231,7 @@ platform_properties:
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "version:to_2025"}
]
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
device_type: none
cpu: x86
$flutter/osx_sdk : >-
@ -247,7 +247,7 @@ platform_properties:
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
{"dependency": "open_jdk", "version": "version:21"}
]
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
cpu: x86
device_type: "mokey"
@ -258,7 +258,7 @@ platform_properties:
{"dependency": "android_sdk", "version": "version:36v1"},
{"dependency": "open_jdk", "version": "version:21"}
]
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
cpu: arm64
device_type: "mokey"
@ -273,7 +273,7 @@ platform_properties:
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "version:to_2025"}
]
os: Mac-14|Mac-15.1|Mac-15.5
os: Mac-14|Mac-15
device_os: iOS-17|iOS-18
$flutter/osx_sdk : >-
{
@ -291,7 +291,7 @@ platform_properties:
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "version:to_2025"}
]
os: Mac-14|Mac-15.1|Mac-15.5
os: Mac-14|Mac-15
cpu: x86
device_os: iOS-17|iOS-18
$flutter/osx_sdk : >-
@ -310,7 +310,7 @@ platform_properties:
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "apple_signing", "version": "none"}
]
os: Mac-14|Mac-15.1|Mac-15.5
os: Mac-14|Mac-15
cpu: arm64
device_os: iOS-17|iOS-18
$flutter/osx_sdk : >-
@ -5525,7 +5525,7 @@ targets:
["devicelab", "ios", "mac"]
task_name: flutter_gallery__transition_perf_e2e_ios
drone_dimensions: >
["device_os=iOS-17|iOS-18","os=Mac-14|Mac-15.5", "cpu=x86"]
["device_os=iOS-17|iOS-18","os=Mac-14|Mac-15", "cpu=x86"]
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
recipe: devicelab/devicelab_drone

View File

@ -30,7 +30,7 @@ platform_properties:
{"dependency": "open_jdk", "version": "version:17"}
]
device_type: none
os: Mac-14|Mac-15.5
os: Mac-14|Mac-15
$flutter/osx_sdk : >-
{
"sdk_version": "16c5032a"
@ -450,7 +450,7 @@ targets:
# Do not remove(https://github.com/flutter/flutter/issues/144644)
# Scheduler will fail to get the platform
drone_dimensions:
- os=Mac-14|Mac-15.5
- os=Mac-14|Mac-15
- name: Mac clangd
recipe: engine_v2/builder
@ -479,7 +479,7 @@ targets:
# Do not remove(https://github.com/flutter/flutter/issues/144644)
# Scheduler will fail to get the platform
drone_dimensions:
- os=Mac-14|Mac-15.5
- os=Mac-14|Mac-15
- cpu=x86
- name: Mac mac_ios_engine_ddm
@ -500,7 +500,7 @@ targets:
# Do not remove(https://github.com/flutter/flutter/issues/144644)
# Scheduler will fail to get the platform
drone_dimensions:
- os=Mac-14|Mac-15.5
- os=Mac-14|Mac-15
- cpu=x86
- name: Linux windows_android_aot_engine

View File

@ -397,7 +397,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {

View File

@ -3,7 +3,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -36,7 +36,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -70,7 +70,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -103,7 +103,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -136,7 +136,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -170,7 +170,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -206,7 +206,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -344,7 +344,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -377,7 +377,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -410,7 +410,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -494,7 +494,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -578,7 +578,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -610,7 +610,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -643,7 +643,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -676,7 +676,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -815,7 +815,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -899,7 +899,7 @@
{
"cas_archive": false,
"drone_dimensions": [
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"device_type=none"
],
"gclient_variables": {
@ -1037,7 +1037,7 @@
"name": "macos/wasm_release",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5"
"os=Mac-14|Mac-15"
],
"gclient_variables": {
"download_android_deps": false,
@ -1067,7 +1067,7 @@
"name": "macos/wasm_debug_unopt",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5"
"os=Mac-14|Mac-15"
],
"gclient_variables": {
"download_android_deps": false,

View File

@ -25,7 +25,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {
@ -83,7 +83,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {
@ -143,7 +143,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {
@ -203,7 +203,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {
@ -261,7 +261,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {
@ -321,7 +321,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {

View File

@ -3,7 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -36,7 +36,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -74,7 +74,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -129,7 +129,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -184,7 +184,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -239,7 +239,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -294,7 +294,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {

View File

@ -19,7 +19,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -86,7 +86,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -142,7 +142,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -207,7 +207,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -258,7 +258,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -309,7 +309,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -372,7 +372,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -426,7 +426,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -479,7 +479,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -545,7 +545,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -602,7 +602,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -658,7 +658,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -724,7 +724,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -779,7 +779,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -834,7 +834,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -901,7 +901,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -959,7 +959,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -1016,7 +1016,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {

View File

@ -16,7 +16,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -63,7 +63,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -112,7 +112,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -159,7 +159,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -206,7 +206,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -253,7 +253,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -302,7 +302,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -353,7 +353,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -402,7 +402,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -451,7 +451,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {

View File

@ -16,7 +16,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -65,7 +65,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -116,7 +116,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -165,7 +165,7 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {

View File

@ -4,7 +4,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -57,7 +57,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -108,7 +108,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -159,7 +159,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-14",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -216,7 +216,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -275,7 +275,7 @@
},
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=x86"
],
"gclient_variables": {
@ -332,7 +332,7 @@
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -400,7 +400,7 @@
},
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {
@ -468,7 +468,7 @@
},
"drone_dimensions": [
"device_type=none",
"os=Mac-14|Mac-15.5",
"os=Mac-14|Mac-15",
"cpu=arm64"
],
"gclient_variables": {

View File

@ -100,7 +100,7 @@ class GenerateBuilderJsonCommand extends Command<bool> {
packageLock,
'Mac',
BrowserName.safari,
specificOS: 'Mac-14|Mac-15.5',
specificOS: 'Mac-14|Mac-15',
cpu: 'arm64',
),
];