From cdc41757ce98c7eb8cb8a939aaa7ad4a9d415edc Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Wed, 23 Oct 2024 22:55:41 -0700
Subject: [PATCH] Remove 'Linux mac_clangd' in favor of 'Mac clangd'

---
 .ci.yaml                                | 12 ------
 ci/builders/mac_unopt_debug_no_rbe.json | 55 -------------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 ci/builders/mac_unopt_debug_no_rbe.json

diff --git a/.ci.yaml b/.ci.yaml
index 0e2436dca702c..793fb4a6d02aa 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -503,20 +503,8 @@ targets:
     drone_dimensions:
       - os=Mac-13|Mac-14
 
-  # TODO(jmagman) Replace with "Mac clangd" when bringup is removed.
-  - name: Linux mac_clangd
-    recipe: engine_v2/engine_v2
-    timeout: 90
-    # Do not remove(https://github.com/flutter/flutter/issues/144644)
-    # Scheduler will fail to get the platform
-    drone_dimensions:
-      - os=Linux
-    properties:
-      config_name: mac_unopt_debug_no_rbe
-
   - name: Mac clangd
     recipe: engine_v2/builder
-    bringup: true
     properties:
       config_name: mac_clangd
       cpu: x86
diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json
deleted file mode 100644
index 4b211e8eb3ba8..0000000000000
--- a/ci/builders/mac_unopt_debug_no_rbe.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "_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)"
-  ],
-  "builds": [
-    {
-      "cas_archive": false,
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac-13|Mac-14",
-        "cpu=x86",
-        "mac_model=Macmini8,1"
-      ],
-      "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"]
-      },
-      "properties": {
-          "$flutter/osx_sdk": {
-              "sdk_version": "15a240d"
-          }
-      },
-      "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"
-          ]
-        }
-      ]
-    }
-  ]
-}