From 2c145dacb3cc250fa9203771e3e84b9be607540b Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 28 Mar 2024 17:42:50 -0700 Subject: [PATCH 1/7] Fix the clangd builders, and make them non-bringup. --- .ci.yaml | 2 -- ci/builders/linux_unopt_debug_no_rbe.json | 2 +- ci/builders/mac_unopt_debug_no_rbe.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 314883c8dda7f..f35c1172c48c3 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -279,7 +279,6 @@ targets: - name: Linux clangd recipe: engine_v2/engine_v2 - bringup: true properties: config_name: linux_unopt_debug_no_rbe @@ -370,7 +369,6 @@ targets: - name: Mac clangd recipe: engine_v2/engine_v2 - bringup: true properties: config_name: mac_unopt_debug_no_rbe diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json index 566ece3c5ff63..befa578edefb9 100644 --- a/ci/builders/linux_unopt_debug_no_rbe.json +++ b/ci/builders/linux_unopt_debug_no_rbe.json @@ -17,7 +17,7 @@ "name": "linux_unopt_debug_no_rbe", "ninja": { "config": "linux_unopt_debug_no_rbe", - "targets": ["flutter/build/dart:copy_dart_sdk"] + "targets": [] }, "tests": [ { diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index 2c8c5eddab5d0..19b534c8dd138 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -23,7 +23,7 @@ "name": "mac_unopt_debug_no_rbe", "ninja": { "config": "mac_unopt_debug_no_rbe", - "targets": ["flutter/build/dart:copy_dart_sdk"] + "targets": [] }, "tests": [ { From 7d58e705747219cf8f07d62e2fa23858a68069db Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 28 Mar 2024 19:54:00 -0700 Subject: [PATCH 2/7] ++ --- ci/builders/linux_unopt_debug_no_rbe.json | 4 +++- ci/builders/mac_unopt_debug_no_rbe.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json index befa578edefb9..bdd8d72d31972 100644 --- a/ci/builders/linux_unopt_debug_no_rbe.json +++ b/ci/builders/linux_unopt_debug_no_rbe.json @@ -12,7 +12,9 @@ "--unoptimized", "--prebuilt-dart-sdk", "--no-rbe", - "--no-goma" + "--no-goma", + "--out-dir", + "linux_unopt_debug_no_rbe" ], "name": "linux_unopt_debug_no_rbe", "ninja": { diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index 19b534c8dd138..74495418417c0 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -18,7 +18,9 @@ "--prebuilt-dart-sdk", "--no-rbe", "--no-goma", - "--xcode-symlinks" + "--xcode-symlinks", + "--out-dir", + "mac_unopt_debug_no_rbe" ], "name": "mac_unopt_debug_no_rbe", "ninja": { From 4cacb0ea4b97f4632ad6eb79bb0f72a5d11c8015 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 28 Mar 2024 20:20:51 -0700 Subject: [PATCH 3/7] ++ --- ci/builders/linux_unopt_debug_no_rbe.json | 6 ++---- ci/builders/mac_unopt_debug_no_rbe.json | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json index bdd8d72d31972..06abcb6ded9ef 100644 --- a/ci/builders/linux_unopt_debug_no_rbe.json +++ b/ci/builders/linux_unopt_debug_no_rbe.json @@ -12,13 +12,11 @@ "--unoptimized", "--prebuilt-dart-sdk", "--no-rbe", - "--no-goma", - "--out-dir", - "linux_unopt_debug_no_rbe" + "--no-goma" ], "name": "linux_unopt_debug_no_rbe", "ninja": { - "config": "linux_unopt_debug_no_rbe", + "config": "host_debug_unopt", "targets": [] }, "tests": [ diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index 74495418417c0..623157adb7ffe 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -18,13 +18,11 @@ "--prebuilt-dart-sdk", "--no-rbe", "--no-goma", - "--xcode-symlinks", - "--out-dir", - "mac_unopt_debug_no_rbe" + "--xcode-symlinks" ], "name": "mac_unopt_debug_no_rbe", "ninja": { - "config": "mac_unopt_debug_no_rbe", + "config": "host_debug_unopt", "targets": [] }, "tests": [ From 82c9107b1d063183032f35130d2c528b48a90a31 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 28 Mar 2024 20:43:46 -0700 Subject: [PATCH 4/7] ++ --- ci/builders/linux_unopt_debug_no_rbe.json | 6 ++++-- ci/builders/mac_unopt_debug_no_rbe.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json index 06abcb6ded9ef..c14edc5075235 100644 --- a/ci/builders/linux_unopt_debug_no_rbe.json +++ b/ci/builders/linux_unopt_debug_no_rbe.json @@ -12,11 +12,13 @@ "--unoptimized", "--prebuilt-dart-sdk", "--no-rbe", - "--no-goma" + "--no-goma", + "--target-dir", + "linux_unopt_debug_no_rbe" ], "name": "linux_unopt_debug_no_rbe", "ninja": { - "config": "host_debug_unopt", + "config": "linux_unopt_debug_no_rbe", "targets": [] }, "tests": [ diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index 623157adb7ffe..f9f84cb9d1f27 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -18,11 +18,13 @@ "--prebuilt-dart-sdk", "--no-rbe", "--no-goma", - "--xcode-symlinks" + "--xcode-symlinks", + "--target-dir", + "mac_unopt_debug_no_rbe" ], "name": "mac_unopt_debug_no_rbe", "ninja": { - "config": "host_debug_unopt", + "config": "mac_unopt_debug_no_rbe", "targets": [] }, "tests": [ From 173b81bdf771b714b521ed74cd3cc8b58b892f1a Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 29 Mar 2024 11:38:26 -0700 Subject: [PATCH 5/7] ++ --- ci/builders/linux_unopt_debug_no_rbe.json | 5 +---- ci/builders/mac_unopt_debug_no_rbe.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json index c14edc5075235..0967962b21993 100644 --- a/ci/builders/linux_unopt_debug_no_rbe.json +++ b/ci/builders/linux_unopt_debug_no_rbe.json @@ -11,16 +11,13 @@ "debug", "--unoptimized", "--prebuilt-dart-sdk", + "--no-lto", "--no-rbe", "--no-goma", "--target-dir", "linux_unopt_debug_no_rbe" ], "name": "linux_unopt_debug_no_rbe", - "ninja": { - "config": "linux_unopt_debug_no_rbe", - "targets": [] - }, "tests": [ { "language": "dart", diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index f9f84cb9d1f27..0dc2e3ca9c725 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -16,6 +16,7 @@ "debug", "--unoptimized", "--prebuilt-dart-sdk", + "--no-lto", "--no-rbe", "--no-goma", "--xcode-symlinks", @@ -23,10 +24,6 @@ "mac_unopt_debug_no_rbe" ], "name": "mac_unopt_debug_no_rbe", - "ninja": { - "config": "mac_unopt_debug_no_rbe", - "targets": [] - }, "tests": [ { "language": "dart", From 60f0b12a7ef10edf36e301bb67c8ce0105006b95 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 29 Mar 2024 11:50:58 -0700 Subject: [PATCH 6/7] ++ --- ci/builders/linux_unopt_debug_no_rbe.json | 10 +++++++++- ci/builders/mac_unopt_debug_no_rbe.json | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json index 0967962b21993..38ee6cbd60cb8 100644 --- a/ci/builders/linux_unopt_debug_no_rbe.json +++ b/ci/builders/linux_unopt_debug_no_rbe.json @@ -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": [ { @@ -18,6 +22,10 @@ "linux_unopt_debug_no_rbe" ], "name": "linux_unopt_debug_no_rbe", + "ninja": { + "config": "linux_unopt_debug_no_rbe", + "targets": ["flutter/tools/font_subset"] + }, "tests": [ { "language": "dart", diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index 0dc2e3ca9c725..af2acdd1950f1 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -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": [ { @@ -24,6 +28,10 @@ "mac_unopt_debug_no_rbe" ], "name": "mac_unopt_debug_no_rbe", + "ninja": { + "config": "mac_unopt_debug_no_rbe", + "targets": ["flutter/tools/font_subset"] + }, "tests": [ { "language": "dart", From a19e053684afd6f121a1e272a39f1fa27da4a1f3 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 29 Mar 2024 12:41:44 -0700 Subject: [PATCH 7/7] ++ --- .ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index f35c1172c48c3..65e5d9a78a3d2 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -368,7 +368,11 @@ targets: - os=Mac-13 - name: Mac clangd + 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