From 53aaea22a1a77103f0df8593095140c2a94e1ecf Mon Sep 17 00:00:00 2001
From: Xilai Zhang <xilaizhang@google.com>
Date: Tue, 5 Mar 2024 14:19:40 -0800
Subject: [PATCH 1/2] Revert "Remove unused drone_dimension field (#50893)"

This reverts commit 23467e04433d848ed5e074b0997a1be9296e4077.
---
 .ci.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.ci.yaml b/.ci.yaml
index b33d6efd5691d..39bee18c344c9 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -205,6 +205,8 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_fuchsia
+    drone_dimensions:
+      - os=Linux
     dimensions:
       kvm: "1"
     # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
@@ -242,6 +244,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_arm_host_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
@@ -254,6 +258,8 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_host_desktop_engine
     recipe: engine_v2/engine_v2
@@ -262,6 +268,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_host_desktop_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_android_aot_engine
     recipe: engine_v2/engine_v2
@@ -270,6 +278,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_android_aot_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_android_debug_engine
     recipe: engine_v2/engine_v2
@@ -278,6 +288,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_android_debug_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_license
     recipe: engine_v2/builder
@@ -293,6 +305,8 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_web_engine
+    drone_dimensions:
+      - os=Linux
     runIf:
       - DEPS
       - .ci.yaml
@@ -345,6 +359,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: mac_android_aot_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
@@ -382,6 +398,8 @@ targets:
         {
           "sdk_version": "15a240d"
         }
+    drone_dimensions:
+      - os=Mac-13
 
   - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
@@ -401,6 +419,9 @@ targets:
         {
           "sdk_version": "15a240d"
         }
+    drone_dimensions:
+      - os=Mac-13
+      - cpu=x86
 
   - name: Mac impeller-cmake-example
     bringup: true
@@ -417,6 +438,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: windows_android_aot_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_host_engine
     recipe: engine_v2/engine_v2
@@ -425,6 +448,8 @@ targets:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: windows_host_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_arm_host_engine
     recipe: engine_v2/engine_v2
@@ -435,6 +460,8 @@ targets:
     properties:
       add_recipes_cq: "true"
       config_name: windows_arm_host_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_unopt
     recipe: engine_v2/builder

From e10926b826d7c1d39b50243c20286ba03ffdb829 Mon Sep 17 00:00:00 2001
From: Xilai Zhang <xilaizhang@google.com>
Date: Tue, 5 Mar 2024 14:31:51 -0800
Subject: [PATCH 2/2] Update .ci.yaml

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

diff --git a/.ci.yaml b/.ci.yaml
index 39bee18c344c9..585fecc95620b 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -205,6 +205,8 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_fuchsia
+    # Do not remove(https://github.com/flutter/flutter/issues/144644)
+    # Scheduler will fail to get the platform
     drone_dimensions:
       - os=Linux
     dimensions: