Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Add standalone 'Mac clangd' builder to replace 'Linux mac_clangd' orchestrator #56014

Merged
merged 8 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ targets:
- name: Linux clangd
recipe: engine_v2/builder
properties:
config_name: linux_unopt_debug_no_rbe
config_name: linux_clangd

- name: Linux linux_unopt
recipe: engine_v2/engine_v2
Expand Down Expand Up @@ -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
Expand All @@ -514,6 +514,13 @@ targets:
properties:
config_name: mac_unopt_debug_no_rbe

- name: Mac clangd
recipe: engine_v2/builder
bringup: true
properties:
config_name: mac_clangd
cpu: x86

- name: Mac mac_unopt
recipe: engine_v2/engine_v2
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
40 changes: 40 additions & 0 deletions ci/builders/standalone/mac_clangd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"_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)"
],
"cas_archive": false,
"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"
]
}
]
}