Skip to content

Commit

Permalink
[ci] Move remaining macOS tests to ARM (flutter#2486)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartmorgan authored Aug 23, 2022
1 parent 0177042 commit b6eb50e
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,8 @@ macos_template: &MACOS_TEMPLATE
# Only one macOS task can run in parallel without credits, so use them for
# PRs on macOS.
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'

macos_intel_template: &MACOS_INTEL_TEMPLATE
<< : *MACOS_TEMPLATE
osx_instance:
image: monterey-xcode-13.3

macos_arm_template: &MACOS_ARM_TEMPLATE
<< : *MACOS_TEMPLATE
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4.1

flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
upgrade_flutter_script:
Expand Down Expand Up @@ -240,10 +232,10 @@ task:

task:
<< : *FLUTTER_UPGRADE_TEMPLATE
<< : *MACOS_TEMPLATE
matrix:
### iOS tasks ###
- name: ios-platform_tests
<< : *MACOS_ARM_TEMPLATE
env:
PATH: $PATH:/usr/local/bin
matrix:
Expand All @@ -258,7 +250,6 @@ task:
- ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
- name: ios-custom_package_tests
# Run on macOS x64 image with Java runtime installed.
<< : *MACOS_INTEL_TEMPLATE
env:
PATH: $PATH:/usr/local/bin
matrix:
Expand All @@ -276,7 +267,6 @@ task:
- fi
### macOS desktop tasks ###
- name: macos-platform_tests
<< : *MACOS_ARM_TEMPLATE
env:
matrix:
CHANNEL: "master"
Expand Down

0 comments on commit b6eb50e

Please sign in to comment.