[ci] Move remaining macOS tests to ARM (#2486)

This commit is contained in:
stuartmorgan
2022-08-23 16:33:20 -04:00
committed by GitHub
parent 0177042b1c
commit b6eb50e65d

View File

@ -25,16 +25,8 @@ macos_template: &MACOS_TEMPLATE
# Only one macOS task can run in parallel without credits, so use them for # Only one macOS task can run in parallel without credits, so use them for
# PRs on macOS. # PRs on macOS.
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' 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: 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 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
upgrade_flutter_script: upgrade_flutter_script:
@ -240,10 +232,10 @@ task:
task: task:
<< : *FLUTTER_UPGRADE_TEMPLATE << : *FLUTTER_UPGRADE_TEMPLATE
<< : *MACOS_TEMPLATE
matrix: matrix:
### iOS tasks ### ### iOS tasks ###
- name: ios-platform_tests - name: ios-platform_tests
<< : *MACOS_ARM_TEMPLATE
env: env:
PATH: $PATH:/usr/local/bin PATH: $PATH:/usr/local/bin
matrix: matrix:
@ -258,7 +250,6 @@ task:
- ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 13,OS=latest" - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
- name: ios-custom_package_tests - name: ios-custom_package_tests
# Run on macOS x64 image with Java runtime installed. # Run on macOS x64 image with Java runtime installed.
<< : *MACOS_INTEL_TEMPLATE
env: env:
PATH: $PATH:/usr/local/bin PATH: $PATH:/usr/local/bin
matrix: matrix:
@ -276,7 +267,6 @@ task:
- fi - fi
### macOS desktop tasks ### ### macOS desktop tasks ###
- name: macos-platform_tests - name: macos-platform_tests
<< : *MACOS_ARM_TEMPLATE
env: env:
matrix: matrix:
CHANNEL: "master" CHANNEL: "master"