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

Commit b2822f1

Browse files
committed
Add standalone 'Mac clang' builder to replace 'Linux mac_clangd' orchestrator
1 parent 6c4f05c commit b2822f1

File tree

2 files changed

+49
-1
lines changed

2 files changed

+49
-1
lines changed

.ci.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ targets:
503503
drone_dimensions:
504504
- os=Mac-13|Mac-14
505505

506-
# Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
506+
# TODO(jmagman) Replace with "Mac clangd" when bringup is removed.
507507
- name: Linux mac_clangd
508508
recipe: engine_v2/engine_v2
509509
timeout: 90
@@ -514,6 +514,15 @@ targets:
514514
properties:
515515
config_name: mac_unopt_debug_no_rbe
516516

517+
- name: Mac clangd
518+
recipe: engine_v2/builder
519+
bringup: true
520+
timeout: 90
521+
mac_model: "Macmini8,1"
522+
cpu: x86
523+
properties:
524+
config_name: mac_unopt_debug_no_rbe
525+
517526
- name: Mac mac_unopt
518527
recipe: engine_v2/engine_v2
519528
properties:
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"_comment": [
3+
"This build is only used to generate compile_commands.json for clangd ",
4+
"and should not be used for any other purpose.",
5+
"",
6+
"Note the `flutter/tools/font_subset` target is only used because if no ",
7+
"targets are specified, the build will fail, and if an empty list of ",
8+
"targets are specified, all targets are built (wasteful/slow)"
9+
],
10+
"gn": [
11+
"--runtime-mode",
12+
"debug",
13+
"--unoptimized",
14+
"--prebuilt-dart-sdk",
15+
"--no-lto",
16+
"--no-rbe",
17+
"--no-goma",
18+
"--xcode-symlinks",
19+
"--target-dir",
20+
"ci/mac_unopt_debug_no_rbe"
21+
],
22+
"name": "ci/mac_unopt_debug_no_rbe",
23+
"description": "Tests clangd on macOS.",
24+
"ninja": {
25+
"config": "ci/mac_unopt_debug_no_rbe",
26+
"targets": ["flutter/tools/font_subset"]
27+
},
28+
"tests": [
29+
{
30+
"language": "dart",
31+
"name": "clangd",
32+
"script": "flutter/tools/clangd_check/bin/main.dart",
33+
"parameters": [
34+
"--clangd=buildtools/mac-x64/clang/bin/clangd",
35+
"--compile-commands-dir=../out/ci/mac_unopt_debug_no_rbe"
36+
]
37+
}
38+
]
39+
}

0 commit comments

Comments
 (0)