From 9560e19a0e54626144c18eca96e68b751d3a3f6b Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 18 Aug 2022 17:46:17 -0700
Subject: [PATCH 1/3] [ci] Migrate Cirrus tests to Apple Silicon

---
 .cirrus.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a4262d8c80d..2a6a37b6102 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -25,8 +25,9 @@ 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'
-  osx_instance:
-    image: big-sur-xcode-13
+  # Run tasks on Apple Silicon.
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
 
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
@@ -243,11 +244,11 @@ task:
           CHANNEL: "stable"
       create_simulator_script:
         - xcrun simctl list
-        - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-15-0 | xargs xcrun simctl boot
+        - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-13 com.apple.CoreSimulator.SimRuntime.iOS-15-5 | xargs xcrun simctl boot
       build_script:
         - ./script/tool_runner.sh build-examples --ios
       native_test_script:
-        - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
+        - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
     - name: ios-custom_package_tests
       env:
         PATH: $PATH:/usr/local/bin

From 539660faaffe5bc109715cb055e0053e9ab96a06 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 18 Aug 2022 18:08:01 -0700
Subject: [PATCH 2/3] Run ios-custom_package_tests on x64

---
 .cirrus.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 2a6a37b6102..30d45105cdc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -25,7 +25,14 @@ 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'
-  # Run tasks on Apple Silicon.
+
+macos_intel_template: &MACOS_INTEL_TEMPLATE
+  << : *MACOS_TEMPLATE
+  osx_instance:
+    image: big-sur-xcode-13
+
+macos_arm_template: &MACOS_ARM_TEMPLATE
+  << : *MACOS_TEMPLATE
   macos_instance:
     image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
 
@@ -232,11 +239,11 @@ task:
         - ./script/tool_runner.sh native-test --linux --no-integration
 
 task:
-  << : *MACOS_TEMPLATE
   << : *FLUTTER_UPGRADE_TEMPLATE
   matrix:
    ### iOS tasks ###
     - name: ios-platform_tests
+      << : *MACOS_ARM_TEMPLATE
       env:
         PATH: $PATH:/usr/local/bin
         matrix:
@@ -250,6 +257,8 @@ task:
       native_test_script:
         - ./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:
@@ -267,6 +276,7 @@ task:
         - fi
     ### macOS desktop tasks ###
     - name: macos-platform_tests
+      << : *MACOS_ARM_TEMPLATE
       env:
         matrix:
           CHANNEL: "master"

From c436987ec54a8ebf8cfdf0bc50d83477a8b0afcf Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 18 Aug 2022 18:32:35 -0700
Subject: [PATCH 3/3] On Intel use Monterey Xcode 13.3

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 30d45105cdc..6708eb1ec33 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -29,7 +29,7 @@ macos_template: &MACOS_TEMPLATE
 macos_intel_template: &MACOS_INTEL_TEMPLATE
   << : *MACOS_TEMPLATE
   osx_instance:
-    image: big-sur-xcode-13
+    image: monterey-xcode-13.3
 
 macos_arm_template: &MACOS_ARM_TEMPLATE
   << : *MACOS_TEMPLATE