From 475fc4ac9d8335eb068838f9d52e7d75246dc62d Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Wed, 1 Feb 2023 18:34:08 -0800
Subject: [PATCH] Run Mac hostonly tests on any available arch (#119762)

* Run Mac hostonly presubmit tests on any available arch

* Force all Mac tests to run on arm64 to validate in presubmit

* Go back to web tests on x64

* Run plugin_test_ios on x64

* Try Chrome 110 on arm

* Revert chrome bump, remove forcing arm64

* Update issue number
---
 .ci.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 5a47d11b3e7..5a1b5b5c6f2 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -78,7 +78,6 @@ platform_properties:
         ]
       os: Mac-12
       device_type: none
-      cpu: x86 # TODO(jmagman): https://github.com/flutter/flutter/issues/112130
       xcode: 14a5294e # xcode 14.0 beta 5
   mac_arm64:
     properties:
@@ -2697,8 +2696,6 @@ targets:
       task_name: flutter_packaging
       tags: >
         ["framework", "hostonly", "shard", "mac"]
-    dimensions:
-      cpu: "arm64"
 
   - name: Mac flutter_view_macos__start_up
     presubmit: false
@@ -3012,6 +3009,7 @@ targets:
     recipe: devicelab/devicelab_drone
     timeout: 60
     properties:
+      cpu: x86 # https://github.com/flutter/flutter/issues/119750
       dependencies: >-
         [
           {"dependency": "xcode", "version": "14a5294e"},
@@ -3067,7 +3065,6 @@ targets:
     recipe: flutter/flutter_drone
     timeout: 60
     properties:
-      cpu: arm64
       dependencies: >-
         [
           {"dependency": "xcode", "version": "14a5294e"},
@@ -4914,8 +4911,6 @@ targets:
       task_name: flutter_packaging
       tags: >
         ["framework", "hostonly", "shard", "mac"]
-    dimensions:
-      cpu: "arm64"
 
   - name: Windows flutter_packaging
     recipe: packaging_v2/packaging_v2