Skip to content

Commit 72feebe

Browse files
authored
[ci] Migrate Cirrus tests to Apple Silicon (#2472)
1 parent 8ac5729 commit 72feebe

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

.cirrus.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,16 @@ macos_template: &MACOS_TEMPLATE
2525
# Only one macOS task can run in parallel without credits, so use them for
2626
# PRs on macOS.
2727
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
28+
29+
macos_intel_template: &MACOS_INTEL_TEMPLATE
30+
<< : *MACOS_TEMPLATE
2831
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
3038

3139
flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
3240
upgrade_flutter_script:
@@ -231,24 +239,26 @@ task:
231239
- ./script/tool_runner.sh native-test --linux --no-integration
232240

233241
task:
234-
<< : *MACOS_TEMPLATE
235242
<< : *FLUTTER_UPGRADE_TEMPLATE
236243
matrix:
237244
### iOS tasks ###
238245
- name: ios-platform_tests
246+
<< : *MACOS_ARM_TEMPLATE
239247
env:
240248
PATH: $PATH:/usr/local/bin
241249
matrix:
242250
CHANNEL: "master"
243251
CHANNEL: "stable"
244252
create_simulator_script:
245253
- 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
247255
build_script:
248256
- ./script/tool_runner.sh build-examples --ios
249257
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"
251259
- name: ios-custom_package_tests
260+
# Run on macOS x64 image with Java runtime installed.
261+
<< : *MACOS_INTEL_TEMPLATE
252262
env:
253263
PATH: $PATH:/usr/local/bin
254264
matrix:
@@ -266,6 +276,7 @@ task:
266276
- fi
267277
### macOS desktop tasks ###
268278
- name: macos-platform_tests
279+
<< : *MACOS_ARM_TEMPLATE
269280
env:
270281
matrix:
271282
CHANNEL: "master"

0 commit comments

Comments
 (0)