Skip to content

Commit 822ebc4

Browse files
authored
Allow all iOS tests to use either iOS 16 or 17 (#142714)
Undoing flutter/flutter#142323 to allow all iOS tests to use iOS 16 or 17.
1 parent 10e6f4b commit 822ebc4

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.ci.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ platform_properties:
227227
]
228228
os: Mac-13
229229
cpu: x86
230-
device_os: iOS-16
230+
device_os: iOS-16|iOS-17
231231
$flutter/osx_sdk : >-
232232
{
233233
"sdk_version": "15a240d"
@@ -245,7 +245,7 @@ platform_properties:
245245
]
246246
os: Mac-13
247247
cpu: x86
248-
device_os: iOS-16
248+
device_os: iOS-16|iOS-17
249249
$flutter/osx_sdk : >-
250250
{
251251
"sdk_version": "15a240d"
@@ -263,7 +263,7 @@ platform_properties:
263263
]
264264
os: Mac-13
265265
cpu: arm64
266-
device_os: iOS-16
266+
device_os: iOS-16|iOS-17
267267
$flutter/osx_sdk : >-
268268
{
269269
"sdk_version": "15a240d"
@@ -4239,7 +4239,6 @@ targets:
42394239
presubmit: false
42404240
timeout: 60
42414241
properties:
4242-
device_os: iOS-16|iOS-17
42434242
tags: >
42444243
["devicelab", "ios", "mac"]
42454244
task_name: basic_material_app_ios__compile
@@ -4338,7 +4337,6 @@ targets:
43384337
presubmit: false
43394338
timeout: 60
43404339
properties:
4341-
device_os: iOS-16|iOS-17
43424340
tags: >
43434341
["devicelab", "ios", "mac"]
43444342
task_name: flavors_test_ios_xcode_debug
@@ -4367,7 +4365,6 @@ targets:
43674365
presubmit: false
43684366
timeout: 60
43694367
properties:
4370-
device_os: iOS-16|iOS-17
43714368
tags: >
43724369
["devicelab", "ios", "mac"]
43734370
task_name: flutter_gallery_ios__start_up_xcode_debug
@@ -4427,7 +4424,6 @@ targets:
44274424
presubmit: false
44284425
timeout: 60
44294426
properties:
4430-
device_os: iOS-16|iOS-17
44314427
tags: >
44324428
["devicelab", "ios", "mac"]
44334429
task_name: integration_test_test_ios
@@ -4437,7 +4433,6 @@ targets:
44374433
presubmit: false
44384434
timeout: 60
44394435
properties:
4440-
device_os: iOS-16|iOS-17
44414436
tags: >
44424437
["devicelab", "ios", "mac"]
44434438
task_name: integration_test_test_ios
@@ -4456,7 +4451,6 @@ targets:
44564451
presubmit: false
44574452
timeout: 60
44584453
properties:
4459-
device_os: iOS-16|iOS-17
44604454
tags: >
44614455
["devicelab", "ios", "mac"]
44624456
task_name: integration_ui_ios_driver_xcode_debug
@@ -4583,7 +4577,6 @@ targets:
45834577
presubmit: false
45844578
timeout: 60
45854579
properties:
4586-
device_os: iOS-16|iOS-17
45874580
tags: >
45884581
["devicelab", "ios", "mac"]
45894582
task_name: microbenchmarks_ios_xcode_debug
@@ -4733,7 +4726,6 @@ targets:
47334726
presubmit: false
47344727
timeout: 60
47354728
properties:
4736-
device_os: iOS-16|iOS-17
47374729
tags: >
47384730
["devicelab", "ios", "mac"]
47394731
task_name: hot_mode_dev_cycle_ios__benchmark
@@ -4744,7 +4736,6 @@ targets:
47444736
bringup: true
47454737
timeout: 60
47464738
properties:
4747-
device_os: iOS-16|iOS-17
47484739
tags: >
47494740
["devicelab", "ios", "mac"]
47504741
task_name: hot_mode_dev_cycle_ios__benchmark
@@ -4797,7 +4788,7 @@ targets:
47974788
["devicelab", "ios", "mac"]
47984789
task_name: flutter_gallery__transition_perf_e2e_ios
47994790
drone_dimensions: >
4800-
["device_os=iOS-16","os=Mac-13", "cpu=x86"]
4791+
["device_os=iOS-16|iOS-17","os=Mac-13", "cpu=x86"]
48014792
48024793
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
48034794
recipe: devicelab/devicelab_drone

0 commit comments

Comments
 (0)