From 296322050e4ec3d24a0947b2b1e12af2754e0f27 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <vashworth@google.com>
Date: Mon, 10 Jun 2024 13:10:06 -0500
Subject: [PATCH 1/2] Extend timeout of mac_host_engine builds

---
 ci/builders/mac_host_engine.json | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 1c08026d40f13..3e151824fd822 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -84,7 +84,8 @@
                         "--engine-capture-core-dump"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         },
         {
             "archives": [
@@ -163,7 +164,8 @@
                         "--engine-capture-core-dump"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         },
         {
             "archives": [
@@ -251,7 +253,8 @@
                         "dart,dart-host,engine"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         },
         {
             "archives": [
@@ -321,7 +324,8 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            }
+            },
+            "timeout": 90
         },
         {
             "archives": [
@@ -386,7 +390,8 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            }
+            },
+            "timeout": 90
         },
         {
             "archives": [
@@ -478,7 +483,8 @@
                         "impeller-golden"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         }
     ],
     "generators": {

From a661d66514148db9fea785722ccd7b6521424da8 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <vashworth@google.com>
Date: Mon, 10 Jun 2024 13:53:59 -0500
Subject: [PATCH 2/2] Run mac_host_engine on Mac-13

---
 .ci.yaml                         |  2 +-
 ci/builders/mac_host_engine.json | 30 ++++++++++++------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 35a1c8b987902..b69cc37ede0be 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -363,7 +363,7 @@ targets:
           "sdk_version": "15a240d"
         }
     drone_dimensions:
-      - os=Mac-13|Mac-14
+      - os=Mac-13
 
   - name: Linux mac_clangd
     recipe: engine_v2/engine_v2
diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 3e151824fd822..f72aabce9809f 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -15,7 +15,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13|Mac-14",
+                "os=Mac-13",
                 "cpu=x86",
                 "mac_model=Macmini8,1"
             ],
@@ -84,8 +84,7 @@
                         "--engine-capture-core-dump"
                     ]
                 }
-            ],
-            "timeout": 90
+            ]
         },
         {
             "archives": [
@@ -101,7 +100,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13|Mac-14",
+                "os=Mac-13",
                 "cpu=x86",
                 "mac_model=Macmini8,1"
             ],
@@ -164,8 +163,7 @@
                         "--engine-capture-core-dump"
                     ]
                 }
-            ],
-            "timeout": 90
+            ]
         },
         {
             "archives": [
@@ -182,7 +180,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13|Mac-14",
+                "os=Mac-13",
                 "cpu=x86",
                 "mac_model=Macmini8,1"
             ],
@@ -253,8 +251,7 @@
                         "dart,dart-host,engine"
                     ]
                 }
-            ],
-            "timeout": 90
+            ]
         },
         {
             "archives": [
@@ -271,7 +268,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13|Mac-14",
+                "os=Mac-13",
                 "cpu=x86"
             ],
             "gclient_variables": {
@@ -324,8 +321,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            },
-            "timeout": 90
+            }
         },
         {
             "archives": [
@@ -341,7 +337,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13|Mac-14",
+                "os=Mac-13",
                 "cpu=x86"
             ],
             "gclient_variables": {
@@ -390,8 +386,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            },
-            "timeout": 90
+            }
         },
         {
             "archives": [
@@ -414,7 +409,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13|Mac-14",
+                "os=Mac-13",
                 "cpu=arm64"
             ],
             "gclient_variables": {
@@ -483,8 +478,7 @@
                         "impeller-golden"
                     ]
                 }
-            ],
-            "timeout": 90
+            ]
         }
     ],
     "generators": {