From 71195916f20f017c0a1468abbea61abdd0d249ca Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 13 Apr 2023 19:50:56 -0700
Subject: [PATCH 1/3] Run Mac ci builders on arm

---
 .ci.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.ci.yaml b/.ci.yaml
index d4637c128aba8..f4436e952da98 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -52,7 +52,7 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:11"}
         ]
       device_type: none
-      cpu: x86
+      cpu: arm64
       os: Mac-12
       xcode: 14a5294e # xcode 14.0 beta 5
   windows:
@@ -438,6 +438,7 @@ targets:
     timeout: 60
     properties:
       release_build: "true"
+      cpu: x86 # https://github.com/flutter/flutter/issues/124833
       config_name: mac_ios_engine
       $flutter/osx_sdk : >-
         { "sdk_version": "14a5294e" }

From 0a4a0cd59ec29b594389e1de8c501b40306d6efb Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 14 Apr 2023 12:16:26 -0700
Subject: [PATCH 2/3] Rebase

---
 .ci.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index f4436e952da98..9e07118909b2c 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -383,8 +383,6 @@ targets:
     recipe: engine/engine_lint
     properties:
       add_recipes_cq: "true"
-      cores: "8"
-      cpu: arm64
       lint_host: "true"
       lint_ios: "false"
     timeout: 75
@@ -406,7 +404,6 @@ targets:
     recipe: engine/engine_lint
     properties:
       add_recipes_cq: "true"
-      cpu: arm64
       lint_host: "false"
       lint_ios: "true"
     timeout: 75
@@ -453,7 +450,6 @@ targets:
     timeout: 60
     properties:
       release_build: "true"
-      cpu: arm64
       config_name: mac_impeller_cmake_example
       $flutter/osx_sdk : >-
         { "sdk_version": "14a5294e" }

From cf9833eca7284af5bffe8d50bd30be621227a9ac Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 14 Apr 2023 12:28:16 -0700
Subject: [PATCH 3/3] Match x86 to Macmini8,1

---
 .ci.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.ci.yaml b/.ci.yaml
index 9e07118909b2c..89709c78d4e84 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -338,6 +338,7 @@ targets:
         {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
+      cpu: x86 # https://github.com/flutter/flutter/issues/124877
       mac_model: "Macmini8,1"
     timeout: 75
 
@@ -372,6 +373,7 @@ targets:
     recipe: engine/engine_unopt
     properties:
       add_recipes_cq: "true"
+      cpu: x86 # https://github.com/flutter/flutter/issues/124877
       runtime_versions: >-
         [
           "ios-16-0_14a5294e"