From d371fdbc7e4b6f89351a776bea1291725e0aa3dc Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Mon, 21 Oct 2024 22:06:30 -0700
Subject: [PATCH 1/8] Add standalone 'Mac clang' builder to replace 'Linux
 mac_clangd' orchestrator

---
 .ci.yaml                                      | 10 ++++-
 .../standalone/mac_unopt_debug_no_rbe.json    | 39 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 ci/builders/standalone/mac_unopt_debug_no_rbe.json

diff --git a/.ci.yaml b/.ci.yaml
index 239cce546881e..fa6be69423094 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -503,7 +503,7 @@ targets:
     drone_dimensions:
       - os=Mac-13|Mac-14
 
-  # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
+  # TODO(jmagman) Replace with "Mac clangd" when bringup is removed.
   - name: Linux mac_clangd
     recipe: engine_v2/engine_v2
     timeout: 90
@@ -514,6 +514,14 @@ targets:
     properties:
       config_name: mac_unopt_debug_no_rbe
 
+  - name: Mac clangd
+    recipe: engine_v2/builder
+    bringup: true
+    timeout: 90
+    properties:
+      config_name: mac_unopt_debug_no_rbe
+      cpu: x86
+
   - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
     properties:
diff --git a/ci/builders/standalone/mac_unopt_debug_no_rbe.json b/ci/builders/standalone/mac_unopt_debug_no_rbe.json
new file mode 100644
index 0000000000000..a7ae5ff449cdb
--- /dev/null
+++ b/ci/builders/standalone/mac_unopt_debug_no_rbe.json
@@ -0,0 +1,39 @@
+{
+  "_comment": [
+    "This build is only used to generate compile_commands.json for clangd ",
+    "and should not be used for any other purpose.",
+    "",
+    "Note the `flutter/tools/font_subset` target is only used because if no ",
+    "targets are specified, the build will fail, and if an empty list of ",
+    "targets are specified, all targets are built (wasteful/slow)"
+  ],
+  "gn": [
+    "--runtime-mode",
+    "debug",
+    "--unoptimized",
+    "--prebuilt-dart-sdk",
+    "--no-lto",
+    "--no-rbe",
+    "--no-goma",
+    "--xcode-symlinks",
+    "--target-dir",
+    "ci/mac_unopt_debug_no_rbe"
+  ],
+  "name": "ci/mac_unopt_debug_no_rbe",
+  "description": "Tests clangd on macOS.",
+  "ninja": {
+    "config": "ci/mac_unopt_debug_no_rbe",
+    "targets": ["flutter/tools/font_subset"]
+  },
+  "tests": [
+    {
+      "language": "dart",
+      "name": "clangd",
+      "script": "flutter/tools/clangd_check/bin/main.dart",
+      "parameters": [
+        "--clangd=buildtools/mac-x64/clang/bin/clangd",
+        "--compile-commands-dir=../out/ci/mac_unopt_debug_no_rbe"
+      ]
+    }
+  ]
+}

From 5687decd364fa62bdbcf117a0b24ecbbe0ea9914 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Mon, 21 Oct 2024 22:20:41 -0700
Subject: [PATCH 2/8] mac_unopt test

---
 .ci.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index fa6be69423094..30a73b522a556 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -517,17 +517,16 @@ targets:
   - name: Mac clangd
     recipe: engine_v2/builder
     bringup: true
-    timeout: 90
     properties:
       config_name: mac_unopt_debug_no_rbe
       cpu: x86
 
   - name: Mac mac_unopt
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
+    bringup: true
     properties:
-      config_name: mac_unopt
-      add_recipes_cq: "true"
-    timeout: 120
+      config_name: mac_unopt_debug_no_rbe
+      cpu: x86
 
   - name: Mac mac_ios_engine
     recipe: engine_v2/engine_v2

From 99a9f78239867ee8597fb27d3c943e86618424cf Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Mon, 21 Oct 2024 22:26:39 -0700
Subject: [PATCH 3/8] empty


From bf396ad17ead17c6f6a3831e93853512f498c93a Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Mon, 21 Oct 2024 22:28:14 -0700
Subject: [PATCH 4/8] mac_unopt

---
 .ci.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci.yaml b/.ci.yaml
index 30a73b522a556..c90ed49da7e99 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -523,7 +523,6 @@ targets:
 
   - name: Mac mac_unopt
     recipe: engine_v2/builder
-    bringup: true
     properties:
       config_name: mac_unopt_debug_no_rbe
       cpu: x86

From 14c28048d7c7b565242a6a38630e95cc06e24346 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Mon, 21 Oct 2024 22:39:45 -0700
Subject: [PATCH 5/8] mac_unopt

---
 .ci.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index c90ed49da7e99..8e228a711b97b 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -522,10 +522,11 @@ targets:
       cpu: x86
 
   - name: Mac mac_unopt
-    recipe: engine_v2/builder
+    recipe: engine_v2/engine_v2
     properties:
-      config_name: mac_unopt_debug_no_rbe
-      cpu: x86
+      config_name: mac_unopt
+      add_recipes_cq: "true"
+    timeout: 120
 
   - name: Mac mac_ios_engine
     recipe: engine_v2/engine_v2

From 4175dffa96b01355497de557f5292a4a45ed861a Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Tue, 22 Oct 2024 20:02:19 -0700
Subject: [PATCH 6/8] Review edits

---
 .ci.yaml                                                    | 6 ++++--
 .../{linux_unopt_debug_no_rbe.json => linux_clangd.json}    | 0
 .../{mac_unopt_debug_no_rbe.json => mac_clangd.json}        | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename ci/builders/standalone/{linux_unopt_debug_no_rbe.json => linux_clangd.json} (100%)
 rename ci/builders/standalone/{mac_unopt_debug_no_rbe.json => mac_clangd.json} (100%)

diff --git a/.ci.yaml b/.ci.yaml
index 8e228a711b97b..ef2c76d1f4e6c 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -405,8 +405,9 @@ targets:
 
   - name: Linux clangd
     recipe: engine_v2/builder
+    cas_archive: false
     properties:
-      config_name: linux_unopt_debug_no_rbe
+      config_name: linux_clangd
 
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
@@ -517,8 +518,9 @@ targets:
   - name: Mac clangd
     recipe: engine_v2/builder
     bringup: true
+    cas_archive: false
     properties:
-      config_name: mac_unopt_debug_no_rbe
+      config_name: mac_clangd
       cpu: x86
 
   - name: Mac mac_unopt
diff --git a/ci/builders/standalone/linux_unopt_debug_no_rbe.json b/ci/builders/standalone/linux_clangd.json
similarity index 100%
rename from ci/builders/standalone/linux_unopt_debug_no_rbe.json
rename to ci/builders/standalone/linux_clangd.json
diff --git a/ci/builders/standalone/mac_unopt_debug_no_rbe.json b/ci/builders/standalone/mac_clangd.json
similarity index 100%
rename from ci/builders/standalone/mac_unopt_debug_no_rbe.json
rename to ci/builders/standalone/mac_clangd.json

From 60abd0025daa5f7a6e240497a981c40354a71b66 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Tue, 22 Oct 2024 20:06:31 -0700
Subject: [PATCH 7/8] use_cas

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

diff --git a/.ci.yaml b/.ci.yaml
index ef2c76d1f4e6c..8b730d90f32e5 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -405,7 +405,7 @@ targets:
 
   - name: Linux clangd
     recipe: engine_v2/builder
-    cas_archive: false
+    use_cas: false
     properties:
       config_name: linux_clangd
 
@@ -518,7 +518,7 @@ targets:
   - name: Mac clangd
     recipe: engine_v2/builder
     bringup: true
-    cas_archive: false
+    use_cas: false
     properties:
       config_name: mac_clangd
       cpu: x86

From c7374ab901c9e91a0c95a599c244de3a0d9c3e01 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Tue, 22 Oct 2024 20:08:55 -0700
Subject: [PATCH 8/8] cas_archive

---
 .ci.yaml                                 | 2 --
 ci/builders/standalone/linux_clangd.json | 1 +
 ci/builders/standalone/mac_clangd.json   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 8b730d90f32e5..0e2436dca702c 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -405,7 +405,6 @@ targets:
 
   - name: Linux clangd
     recipe: engine_v2/builder
-    use_cas: false
     properties:
       config_name: linux_clangd
 
@@ -518,7 +517,6 @@ targets:
   - name: Mac clangd
     recipe: engine_v2/builder
     bringup: true
-    use_cas: false
     properties:
       config_name: mac_clangd
       cpu: x86
diff --git a/ci/builders/standalone/linux_clangd.json b/ci/builders/standalone/linux_clangd.json
index 05a775a1cab20..7dc297eb0abe8 100644
--- a/ci/builders/standalone/linux_clangd.json
+++ b/ci/builders/standalone/linux_clangd.json
@@ -7,6 +7,7 @@
     "targets are specified, the build will fail, and if an empty list of ",
     "targets are specified, all targets are built (wasteful/slow)"
   ],
+  "cas_archive": false,
   "gn": [
     "--runtime-mode",
     "debug",
diff --git a/ci/builders/standalone/mac_clangd.json b/ci/builders/standalone/mac_clangd.json
index a7ae5ff449cdb..4f7b01c033e7e 100644
--- a/ci/builders/standalone/mac_clangd.json
+++ b/ci/builders/standalone/mac_clangd.json
@@ -7,6 +7,7 @@
     "targets are specified, the build will fail, and if an empty list of ",
     "targets are specified, all targets are built (wasteful/slow)"
   ],
+  "cas_archive": false,
   "gn": [
     "--runtime-mode",
     "debug",