@@ -25,8 +25,16 @@ macos_template: &MACOS_TEMPLATE
25
25
# Only one macOS task can run in parallel without credits, so use them for
26
26
# PRs on macOS.
27
27
use_compute_credits : $CIRRUS_USER_COLLABORATOR == 'true'
28
+
29
+ macos_intel_template : &MACOS_INTEL_TEMPLATE
30
+ << : *MACOS_TEMPLATE
28
31
osx_instance :
29
- image : big-sur-xcode-13
32
+ image : monterey-xcode-13.3
33
+
34
+ macos_arm_template : &MACOS_ARM_TEMPLATE
35
+ << : *MACOS_TEMPLATE
36
+ macos_instance :
37
+ image : ghcr.io/cirruslabs/macos-monterey-xcode:13.4
30
38
31
39
flutter_upgrade_template : &FLUTTER_UPGRADE_TEMPLATE
32
40
upgrade_flutter_script :
@@ -231,24 +239,26 @@ task:
231
239
- ./script/tool_runner.sh native-test --linux --no-integration
232
240
233
241
task :
234
- << : *MACOS_TEMPLATE
235
242
<< : *FLUTTER_UPGRADE_TEMPLATE
236
243
matrix :
237
244
# ## iOS tasks ###
238
245
- name : ios-platform_tests
246
+ << : *MACOS_ARM_TEMPLATE
239
247
env :
240
248
PATH : $PATH:/usr/local/bin
241
249
matrix :
242
250
CHANNEL : " master"
243
251
CHANNEL : " stable"
244
252
create_simulator_script :
245
253
- xcrun simctl list
246
- - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-15-0 | xargs xcrun simctl boot
254
+ - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-13 com.apple.CoreSimulator.SimRuntime.iOS-15-5 | xargs xcrun simctl boot
247
255
build_script :
248
256
- ./script/tool_runner.sh build-examples --ios
249
257
native_test_script :
250
- - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11 ,OS=latest"
258
+ - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 13 ,OS=latest"
251
259
- name : ios-custom_package_tests
260
+ # Run on macOS x64 image with Java runtime installed.
261
+ << : *MACOS_INTEL_TEMPLATE
252
262
env :
253
263
PATH : $PATH:/usr/local/bin
254
264
matrix :
@@ -266,6 +276,7 @@ task:
266
276
- fi
267
277
# ## macOS desktop tasks ###
268
278
- name : macos-platform_tests
279
+ << : *MACOS_ARM_TEMPLATE
269
280
env :
270
281
matrix :
271
282
CHANNEL : " master"
0 commit comments