Skip to content

Commit 2da1ff2

Browse files
authored
Run mac staging tests with Xcode 15 (flutter#140518)
Run macOS staging tests with Xcode 15 and macOS 13. Also, cleanup some comments.
1 parent 62f1594 commit 2da1ff2

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

.ci.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ platform_properties:
8181
]
8282
os: Mac-12|Mac-13
8383
device_type: none
84-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
8584
$flutter/osx_sdk : >-
8685
{
8786
"sdk_version": "14e300c"
@@ -95,7 +94,6 @@ platform_properties:
9594
os: Mac-12|Mac-13
9695
device_type: none
9796
cpu: arm64
98-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
9997
$flutter/osx_sdk : >-
10098
{
10199
"sdk_version": "14e300c"
@@ -111,7 +109,6 @@ platform_properties:
111109
os: Mac-12|Mac-13
112110
tags: >
113111
["devicelab", "hostonly", "mac"]
114-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
115112
$flutter/osx_sdk : >-
116113
{
117114
"sdk_version": "14e300c"
@@ -125,7 +122,6 @@ platform_properties:
125122
os: Mac-12|Mac-13
126123
device_type: none
127124
cpu: x86
128-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
129125
$flutter/osx_sdk : >-
130126
{
131127
"sdk_version": "14e300c"
@@ -140,7 +136,6 @@ platform_properties:
140136
os: Mac-12|Mac-13
141137
device_type: none
142138
cpu: x86
143-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
144139
$flutter/osx_sdk : >-
145140
{
146141
"sdk_version": "14e300c"
@@ -176,7 +171,6 @@ platform_properties:
176171
os: Mac-12|Mac-13
177172
cpu: x86
178173
device_os: iOS-16
179-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
180174
$flutter/osx_sdk : >-
181175
{
182176
"sdk_version": "14e300c"
@@ -191,7 +185,6 @@ platform_properties:
191185
os: Mac-12|Mac-13
192186
cpu: arm64
193187
device_os: iOS-16
194-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
195188
$flutter/osx_sdk : >-
196189
{
197190
"sdk_version": "14e300c"
@@ -4014,11 +4007,11 @@ targets:
40144007
tags: >
40154008
["devicelab", "ios", "mac"]
40164009
task_name: flavors_test_ios_xcode_debug
4017-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
40184010
$flutter/osx_sdk : >-
40194011
{
4020-
"sdk_version": "14c18"
4012+
"sdk_version": "15a240d"
40214013
}
4014+
os: Mac-13
40224015
bringup: true
40234016

40244017
# TODO(vashworth): Stop running in presubmit after macOS 13 upgrade is complete (https://github.com/flutter/flutter/issues/134737)
@@ -4056,11 +4049,11 @@ targets:
40564049
tags: >
40574050
["devicelab", "ios", "mac"]
40584051
task_name: flutter_gallery_ios__start_up_xcode_debug
4059-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
40604052
$flutter/osx_sdk : >-
40614053
{
4062-
"sdk_version": "14c18"
4054+
"sdk_version": "15a240d"
40634055
}
4056+
os: Mac-13
40644057
bringup: true
40654058

40664059
- name: Mac_ios flutter_view_ios__start_up
@@ -4147,11 +4140,11 @@ targets:
41474140
tags: >
41484141
["devicelab", "ios", "mac"]
41494142
task_name: integration_ui_ios_driver_xcode_debug
4150-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
41514143
$flutter/osx_sdk : >-
41524144
{
4153-
"sdk_version": "14c18"
4145+
"sdk_version": "15a240d"
41544146
}
4147+
os: Mac-13
41554148
bringup: true
41564149

41574150
- name: Mac_ios integration_ui_ios_frame_number
@@ -4296,11 +4289,11 @@ targets:
42964289
tags: >
42974290
["devicelab", "ios", "mac"]
42984291
task_name: microbenchmarks_ios_xcode_debug
4299-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
43004292
$flutter/osx_sdk : >-
43014293
{
4302-
"sdk_version": "14c18"
4294+
"sdk_version": "15a240d"
43034295
}
4296+
os: Mac-13
43044297
bringup: true
43054298

43064299
- name: Mac native_assets_ios_simulator
@@ -4493,7 +4486,6 @@ targets:
44934486

44944487
- name: Mac_build_test flutter_gallery__transition_perf_e2e_ios
44954488
recipe: devicelab/devicelab_drone_build_test
4496-
# TODO(vashworth): Take out of bringup once https://github.com/flutter/flutter/issues/138194 is resolved.
44974489
timeout: 60
44984490
properties:
44994491
tags: >

0 commit comments

Comments
 (0)