From 85174dc4a50c38d38bc55af8c3b2d1d8b80c5982 Mon Sep 17 00:00:00 2001
From: Godofredo Contreras <godofredoc@google.com>
Date: Tue, 10 Oct 2023 11:47:11 -0700
Subject: [PATCH 1/2] Use x86 machines for ios builds.

This is to workaround rosetta not being installed in dart-internal
machines and to unblock beta releases.

Bug: https://github.com/flutter/flutter/issues/136219
---
 ci/builders/mac_ios_engine.json | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index 600f495929b0c..4c3cebe29758b 100644
--- a/ci/builders/mac_ios_engine.json
+++ b/ci/builders/mac_ios_engine.json
@@ -4,7 +4,8 @@
             "drone_dimensions": [
                 "device_type=none",
                 "mac_model=Macmini8,1",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -26,7 +27,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -49,7 +51,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -72,7 +75,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -96,7 +100,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -121,7 +126,8 @@
             "drone_dimensions": [
                 "device_type=none",
                 "mac_model=Macmini8,1",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -144,7 +150,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -168,7 +175,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -192,7 +200,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -217,7 +226,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12"
+                "os=Mac-12",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",

From a0b25ca9f8d1e03d855c0086b85483c21a767d0a Mon Sep 17 00:00:00 2001
From: Godofredo Contreras <godofredoc@google.com>
Date: Tue, 10 Oct 2023 12:35:05 -0700
Subject: [PATCH 2/2] Remove macmini8 dimension.

---
 ci/builders/mac_ios_engine.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index 4c3cebe29758b..3dfc5c4d559b4 100644
--- a/ci/builders/mac_ios_engine.json
+++ b/ci/builders/mac_ios_engine.json
@@ -3,7 +3,6 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "mac_model=Macmini8,1",
                 "os=Mac-12",
                 "cpu=x86"
             ],
@@ -125,7 +124,6 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "mac_model=Macmini8,1",
                 "os=Mac-12",
                 "cpu=x86"
             ],