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

Fix the clangd builders, and make Linux non-bringup. #51765

Merged
matanlurey merged 7 commits into from
Mar 29, 2024
Merged

Fix the clangd builders, and make Linux non-bringup. #51765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c145da
Fix the clangd builders, and make them non-bringup.
matanlurey Mar 29, 2024
7d58e70
++
matanlurey Mar 29, 2024
4cacb0e
++
matanlurey Mar 29, 2024
82c9107
++
matanlurey Mar 29, 2024
173b81b
++
matanlurey Mar 29, 2024
60f0b12
++
matanlurey Mar 29, 2024
a19e053
++
matanlurey Mar 29, 2024
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
6 changes: 4 additions & 2 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ targets:

- name: Linux clangd
recipe: engine_v2/engine_v2
bringup: true
properties:
config_name: linux_unopt_debug_no_rbe

Expand Down Expand Up @@ -369,8 +368,11 @@ targets:
- os=Mac-13

- name: Mac clangd
Copy link
Member

@zanderso zanderso Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optional nit: Not critical, but this orchestrator could be a Linux host to save 5 minutes of mac host time.

Copy link
Contributor Author

@matanlurey matanlurey Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean I'm down - where can I read about that/how can I do it?

I am guessing orchestrator == drone_dimensions? Is there another example of this?

Copy link
Member

@zanderso zanderso Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you'd change Mac clangd to something like Linux mac_clangd, and then add:

    drone_dimensions:
      - os=Linux

Like in Linux mac_android_aot_engine. Probably has to stay bringup: true in this PR to make sure that works properly.

Copy link
Contributor Author

@matanlurey matanlurey Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

recipe: engine_v2/engine_v2
bringup: true
recipe: engine_v2/engine_v2
# Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
drone_dimensions:
- os=Linux
properties:
config_name: mac_unopt_debug_no_rbe

Expand Down
13 changes: 10 additions & 3 deletions ci/builders/linux_unopt_debug_no_rbe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"_comment": [
"This build is only used to generate compile_commands.json for clangd ",
"and should not be used for any other purpose."
"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": [
{
Expand All @@ -11,13 +15,16 @@
"debug",
"--unoptimized",
"--prebuilt-dart-sdk",
"--no-lto",
"--no-rbe",
"--no-goma"
"--no-goma",
"--target-dir",
"linux_unopt_debug_no_rbe"
],
"name": "linux_unopt_debug_no_rbe",
"ninja": {
"config": "linux_unopt_debug_no_rbe",
"targets": ["flutter/build/dart:copy_dart_sdk"]
"targets": ["flutter/tools/font_subset"]
},
"tests": [
{
Expand Down
13 changes: 10 additions & 3 deletions ci/builders/mac_unopt_debug_no_rbe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"_comment": [
"This build is only used to generate compile_commands.json for clangd ",
"and should not be used for any other purpose."
"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": [
{
Expand All @@ -16,14 +20,17 @@
"debug",
"--unoptimized",
"--prebuilt-dart-sdk",
"--no-lto",
"--no-rbe",
"--no-goma",
"--xcode-symlinks"
"--xcode-symlinks",
"--target-dir",
"mac_unopt_debug_no_rbe"
],
"name": "mac_unopt_debug_no_rbe",
"ninja": {
"config": "mac_unopt_debug_no_rbe",
"targets": ["flutter/build/dart:copy_dart_sdk"]
"targets": ["flutter/tools/font_subset"]
},
"tests": [
{
Expand Down