Skip to content

Commit e11aada

Browse files
vashworthvashworth
authored
[CP stable] Run tests on either macOS 14 or 15 (#171076) (#172480)
Impacted Users: Flutter Infra and Release teams Impact Description: Allows Flutter CI tests to run on macOS 15 Workaround: N/A Risk: low Test Coverage: Yes Validation Steps: N/A Release note: This is a prerequisite to allowing stable branch to be upgraded to macOS 15 Should **NOT** be landed until the following land: * flutter/flutter#172461 * flutter/flutter#172462 land.
1 parent 107d8df commit e11aada

10 files changed

Lines changed: 87 additions & 87 deletions

File tree

‎.ci.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ platform_properties:
142142
[
143143
{"dependency": "apple_signing", "version": "version:to_2025"}
144144
]
145-
os: Mac-14
145+
os: Mac-14|Mac-15
146146
device_type: none
147147
$flutter/osx_sdk : >-
148148
{
@@ -158,7 +158,7 @@ platform_properties:
158158
[
159159
{"dependency": "apple_signing", "version": "version:to_2025"}
160160
]
161-
os: Mac-14
161+
os: Mac-14|Mac-15
162162
device_type: none
163163
cpu: arm64
164164
$flutter/osx_sdk : >-
@@ -177,7 +177,7 @@ platform_properties:
177177
]
178178
device_type: none
179179
mac_model: "Macmini8,1"
180-
os: Mac-14
180+
os: Mac-14|Mac-15
181181
tags: >
182182
["devicelab", "hostonly", "mac"]
183183
$flutter/osx_sdk : >-
@@ -194,7 +194,7 @@ platform_properties:
194194
[
195195
{"dependency": "apple_signing", "version": "version:to_2025"}
196196
]
197-
os: Mac-14
197+
os: Mac-14|Mac-15
198198
device_type: none
199199
cpu: x86
200200
$flutter/osx_sdk : >-
@@ -212,7 +212,7 @@ platform_properties:
212212
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
213213
{"dependency": "apple_signing", "version": "version:to_2025"}
214214
]
215-
os: Mac-14
215+
os: Mac-14|Mac-15
216216
device_type: none
217217
cpu: x86
218218
$flutter/osx_sdk : >-
@@ -227,7 +227,7 @@ platform_properties:
227227
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
228228
{"dependency": "open_jdk", "version": "version:21"}
229229
]
230-
os: Mac-14
230+
os: Mac-14|Mac-15
231231
cpu: x86
232232
device_type: "msm8952"
233233
mac_arm64_android:
@@ -237,7 +237,7 @@ platform_properties:
237237
{"dependency": "android_sdk", "version": "version:35v1"},
238238
{"dependency": "open_jdk", "version": "version:21"}
239239
]
240-
os: Mac-14
240+
os: Mac-14|Mac-15
241241
cpu: arm64
242242
device_type: "msm8952"
243243

@@ -249,7 +249,7 @@ platform_properties:
249249
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
250250
{"dependency": "open_jdk", "version": "version:21"}
251251
]
252-
os: Mac-14
252+
os: Mac-14|Mac-15
253253
cpu: x86
254254
device_type: "mokey"
255255
mac_arm64_mokey:
@@ -259,7 +259,7 @@ platform_properties:
259259
{"dependency": "android_sdk", "version": "version:35v1"},
260260
{"dependency": "open_jdk", "version": "version:21"}
261261
]
262-
os: Mac-14
262+
os: Mac-14|Mac-15
263263
cpu: arm64
264264
device_type: "mokey"
265265

@@ -270,7 +270,7 @@ platform_properties:
270270
{"dependency": "android_sdk", "version": "version:35v1"},
271271
{"dependency": "open_jdk", "version": "version:21"}
272272
]
273-
os: Mac-14
273+
os: Mac-14|Mac-15
274274
cpu: x86
275275
device_type: "Pixel 7 Pro"
276276
mac_ios:
@@ -284,7 +284,7 @@ platform_properties:
284284
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
285285
{"dependency": "apple_signing", "version": "version:to_2025"}
286286
]
287-
os: Mac-14
287+
os: Mac-14|Mac-15
288288
cpu: x86
289289
device_os: iOS-17|iOS-18
290290
$flutter/osx_sdk : >-
@@ -302,7 +302,7 @@ platform_properties:
302302
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
303303
{"dependency": "apple_signing", "version": "version:to_2025"}
304304
]
305-
os: Mac-14
305+
os: Mac-14|Mac-15
306306
cpu: x86
307307
device_os: iOS-17|iOS-18
308308
$flutter/osx_sdk : >-
@@ -320,7 +320,7 @@ platform_properties:
320320
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
321321
{"dependency": "apple_signing", "version": "none"}
322322
]
323-
os: Mac-14
323+
os: Mac-14|Mac-15
324324
cpu: arm64
325325
device_os: iOS-17|iOS-18
326326
$flutter/osx_sdk : >-
@@ -5451,7 +5451,7 @@ targets:
54515451
["devicelab", "ios", "mac"]
54525452
task_name: flutter_gallery__transition_perf_e2e_ios
54535453
drone_dimensions: >
5454-
["device_os=iOS-17|iOS-18","os=Mac-14", "cpu=x86"]
5454+
["device_os=iOS-17|iOS-18","os=Mac-14|Mac-15", "cpu=x86"]
54555455
54565456
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
54575457
recipe: devicelab/devicelab_drone

‎engine/src/flutter/.ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ platform_properties:
3030
{"dependency": "open_jdk", "version": "version:17"}
3131
]
3232
device_type: none
33-
os: Mac-14
33+
os: Mac-14|Mac-15
3434
$flutter/osx_sdk : >-
3535
{
3636
"sdk_version": "16c5032a"
@@ -471,7 +471,7 @@ targets:
471471
# Do not remove(https://github.com/flutter/flutter/issues/144644)
472472
# Scheduler will fail to get the platform
473473
drone_dimensions:
474-
- os=Mac-14
474+
- os=Mac-14|Mac-15
475475

476476
- name: Mac clangd
477477
recipe: engine_v2/builder
@@ -500,7 +500,7 @@ targets:
500500
# Do not remove(https://github.com/flutter/flutter/issues/144644)
501501
# Scheduler will fail to get the platform
502502
drone_dimensions:
503-
- os=Mac-14
503+
- os=Mac-14|Mac-15
504504
- cpu=x86
505505

506506
- name: Linux windows_android_aot_engine

‎engine/src/flutter/ci/builders/linux_web_engine_test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
"recipe": "engine_v2/tester_engine",
420420
"drone_dimensions": [
421421
"device_type=none",
422-
"os=Mac-14|Mac-15.5",
422+
"os=Mac-14|Mac-15",
423423
"cpu=arm64"
424424
],
425425
"gclient_variables": {

‎engine/src/flutter/ci/builders/local_engine.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"cas_archive": false,
55
"drone_dimensions": [
6-
"os=Mac-14",
6+
"os=Mac-14|Mac-15",
77
"device_type=none"
88
],
99
"gclient_variables": {
@@ -36,7 +36,7 @@
3636
{
3737
"cas_archive": false,
3838
"drone_dimensions": [
39-
"os=Mac-14",
39+
"os=Mac-14|Mac-15",
4040
"device_type=none"
4141
],
4242
"gclient_variables": {
@@ -70,7 +70,7 @@
7070
{
7171
"cas_archive": false,
7272
"drone_dimensions": [
73-
"os=Mac-14",
73+
"os=Mac-14|Mac-15",
7474
"device_type=none"
7575
],
7676
"gclient_variables": {
@@ -103,7 +103,7 @@
103103
{
104104
"cas_archive": false,
105105
"drone_dimensions": [
106-
"os=Mac-14",
106+
"os=Mac-14|Mac-15",
107107
"device_type=none"
108108
],
109109
"gclient_variables": {
@@ -136,7 +136,7 @@
136136
{
137137
"cas_archive": false,
138138
"drone_dimensions": [
139-
"os=Mac-14",
139+
"os=Mac-14|Mac-15",
140140
"device_type=none"
141141
],
142142
"gclient_variables": {
@@ -170,7 +170,7 @@
170170
{
171171
"cas_archive": false,
172172
"drone_dimensions": [
173-
"os=Mac-14",
173+
"os=Mac-14|Mac-15",
174174
"device_type=none"
175175
],
176176
"gclient_variables": {
@@ -206,7 +206,7 @@
206206
{
207207
"cas_archive": false,
208208
"drone_dimensions": [
209-
"os=Mac-14",
209+
"os=Mac-14|Mac-15",
210210
"device_type=none"
211211
],
212212
"gclient_variables": {
@@ -344,7 +344,7 @@
344344
{
345345
"cas_archive": false,
346346
"drone_dimensions": [
347-
"os=Mac-14",
347+
"os=Mac-14|Mac-15",
348348
"device_type=none"
349349
],
350350
"gclient_variables": {
@@ -377,7 +377,7 @@
377377
{
378378
"cas_archive": false,
379379
"drone_dimensions": [
380-
"os=Mac-14",
380+
"os=Mac-14|Mac-15",
381381
"device_type=none"
382382
],
383383
"gclient_variables": {
@@ -410,7 +410,7 @@
410410
{
411411
"cas_archive": false,
412412
"drone_dimensions": [
413-
"os=Mac-14",
413+
"os=Mac-14|Mac-15",
414414
"device_type=none"
415415
],
416416
"gclient_variables": {
@@ -494,7 +494,7 @@
494494
{
495495
"cas_archive": false,
496496
"drone_dimensions": [
497-
"os=Mac-14",
497+
"os=Mac-14|Mac-15",
498498
"device_type=none"
499499
],
500500
"gclient_variables": {
@@ -578,7 +578,7 @@
578578
{
579579
"cas_archive": false,
580580
"drone_dimensions": [
581-
"os=Mac-14",
581+
"os=Mac-14|Mac-15",
582582
"device_type=none"
583583
],
584584
"gclient_variables": {
@@ -610,7 +610,7 @@
610610
{
611611
"cas_archive": false,
612612
"drone_dimensions": [
613-
"os=Mac-14",
613+
"os=Mac-14|Mac-15",
614614
"device_type=none"
615615
],
616616
"gclient_variables": {
@@ -643,7 +643,7 @@
643643
{
644644
"cas_archive": false,
645645
"drone_dimensions": [
646-
"os=Mac-14",
646+
"os=Mac-14|Mac-15",
647647
"device_type=none"
648648
],
649649
"gclient_variables": {
@@ -676,7 +676,7 @@
676676
{
677677
"cas_archive": false,
678678
"drone_dimensions": [
679-
"os=Mac-14",
679+
"os=Mac-14|Mac-15",
680680
"device_type=none"
681681
],
682682
"gclient_variables": {
@@ -815,7 +815,7 @@
815815
{
816816
"cas_archive": false,
817817
"drone_dimensions": [
818-
"os=Mac-14",
818+
"os=Mac-14|Mac-15",
819819
"device_type=none"
820820
],
821821
"gclient_variables": {
@@ -899,7 +899,7 @@
899899
{
900900
"cas_archive": false,
901901
"drone_dimensions": [
902-
"os=Mac-14",
902+
"os=Mac-14|Mac-15",
903903
"device_type=none"
904904
],
905905
"gclient_variables": {
@@ -1037,7 +1037,7 @@
10371037
"name": "macos/wasm_release",
10381038
"drone_dimensions": [
10391039
"device_type=none",
1040-
"os=Mac-14"
1040+
"os=Mac-14|Mac-15"
10411041
],
10421042
"gclient_variables": {
10431043
"download_android_deps": false,
@@ -1067,7 +1067,7 @@
10671067
"name": "macos/wasm_debug_unopt",
10681068
"drone_dimensions": [
10691069
"device_type=none",
1070-
"os=Mac-14"
1070+
"os=Mac-14|Mac-15"
10711071
],
10721072
"gclient_variables": {
10731073
"download_android_deps": false,

‎engine/src/flutter/ci/builders/mac_android_aot_engine.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"drone_dimensions": [
2424
"device_type=none",
25-
"os=Mac-14",
25+
"os=Mac-14|Mac-15",
2626
"cpu=x86"
2727
],
2828
"gclient_variables": {
@@ -80,7 +80,7 @@
8080
],
8181
"drone_dimensions": [
8282
"device_type=none",
83-
"os=Mac-14",
83+
"os=Mac-14|Mac-15",
8484
"cpu=x86"
8585
],
8686
"gclient_variables": {
@@ -140,7 +140,7 @@
140140
],
141141
"drone_dimensions": [
142142
"device_type=none",
143-
"os=Mac-14",
143+
"os=Mac-14|Mac-15",
144144
"cpu=x86"
145145
],
146146
"gclient_variables": {
@@ -200,7 +200,7 @@
200200
],
201201
"drone_dimensions": [
202202
"device_type=none",
203-
"os=Mac-14",
203+
"os=Mac-14|Mac-15",
204204
"cpu=x86"
205205
],
206206
"gclient_variables": {
@@ -258,7 +258,7 @@
258258
],
259259
"drone_dimensions": [
260260
"device_type=none",
261-
"os=Mac-14",
261+
"os=Mac-14|Mac-15",
262262
"cpu=x86"
263263
],
264264
"gclient_variables": {
@@ -318,7 +318,7 @@
318318
],
319319
"drone_dimensions": [
320320
"device_type=none",
321-
"os=Mac-14",
321+
"os=Mac-14|Mac-15",
322322
"cpu=x86"
323323
],
324324
"gclient_variables": {

0 commit comments

Comments
 (0)