Move some tasks back to Intel

.cirrus.yml

@@ -57,6 +57,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'
+
+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.3.1
 
@@ -298,23 +306,12 @@ task:
       drive_script:
         - ./script/tool_runner.sh drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
 
-# macOS tasks.
+# ARM macOS tasks.
 task:
-  << : *MACOS_TEMPLATE
+  << : *MACOS_ARM_TEMPLATE
   << : *FLUTTER_UPGRADE_TEMPLATE
   matrix:
-    ### iOS+macOS tasks ***
-    - name: darwin-lint_podspecs
-      script:
-        - ./script/tool_runner.sh podspecs
     ### iOS tasks ###
-    - name: ios-build_all_plugins
-      env:
-        BUILD_ALL_ARGS: "ios --no-codesign"
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
     - name: ios-platform_tests
       env:
         PATH: $PATH:/usr/local/bin
@@ -342,15 +339,6 @@ task:
         # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
         - ./script/tool_runner.sh drive-examples --ios --exclude=script/configs/exclude_integration_ios.yaml
     ### macOS desktop tasks ###
-    - name: macos-build_all_plugins
-      env:
-        BUILD_ALL_ARGS: "macos"
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-      setup_script:
-        - flutter config --enable-macos-desktop
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
     - name: macos-platform_tests
       env:
         matrix:
@@ -366,3 +354,37 @@ task:
         - ./script/tool_runner.sh native-test --macos
       drive_script:
         - ./script/tool_runner.sh drive-examples --macos --exclude=script/configs/exclude_integration_macos.yaml
+
+# Intel macOS tasks.
+task:
+  << : *MACOS_INTEL_TEMPLATE
+  << : *FLUTTER_UPGRADE_TEMPLATE
+  matrix:
+    ### iOS+macOS tasks ***
+    # TODO(stuartmorgan): Move this to M1 once
+    # https://github.com/flutter/flutter/issues/103515 is resolved.
+    - name: darwin-lint_podspecs
+      script:
+        - ./script/tool_runner.sh podspecs
+    ### macOS desktop tasks ###
+    # macos-platform_tests builds all the plugins on M1, so this build is run
+    # on Intel to give us build coverage of both host types.
+    - name: macos-build_all_plugins
+      env:
+        BUILD_ALL_ARGS: "macos"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
+      setup_script:
+        - flutter config --enable-macos-desktop
+      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
+    ### iOS tasks ###
+    # ios-platform_tests builds all the plugins on M1, so this build is run
+    # on Intel to give us build coverage of both host types.
+    - name: ios-build_all_plugins
+      env:
+        BUILD_ALL_ARGS: "ios --no-codesign"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
+      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE