From 966d374f126e0d09d6c4f2072d9443e052bcb323 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Sun, 21 Jun 2026 03:44:52 +0000 Subject: [PATCH 1/3] Disable bazel-diff in CI due to platform compatibility conflicts We disable bazel-diff target filtering to repair the CI. Since this project makes heavy use of target_compatible_with to restrict tests to specific platforms, and Bazel CI's bazel-diff runner operates in plain query mode (which ignores compatibility), it erroneously schedules incompatible tests on the wrong runners and breaks the build. Attempts to use EXP_USE_CQUERY=true also did not resolve this reliably. We comment out USE_BAZEL_DIFF and add an explanatory comment in .bazelci/presubmit.yml. --- .bazelci/presubmit.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 147f752724..bf17494b1d 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -25,9 +25,15 @@ buildifier: bazel: 7.x skip_in_bazel_downstream_pipeline: "Bazel 7 required" .reusable_config: &reusable_config - environment: - USE_BAZEL_DIFF: "1" - EXP_USE_CQUERY: "true" + # We do not enable USE_BAZEL_DIFF because this project makes heavy use of + # target_compatible_with to restrict targets/tests to compatible platforms. + # Bazel CI's built-in bazel-diff integration runs in plain query mode by + # default, which ignores compatibility. This causes it to select and schedule + # platform-incompatible tests on the wrong runners, breaking the build. + # Attempts to use the experimental EXP_USE_CQUERY=true also failed to + # resolve this reliably. + # environment: + # USE_BAZEL_DIFF: "1" build_targets: - "--" - "..." From c27bca7421bfaf995a70df9b92f2b294f8eb5c47 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Sun, 21 Jun 2026 03:45:17 +0000 Subject: [PATCH 2/3] style: shorten bazel-diff explanatory comment --- .bazelci/presubmit.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index bf17494b1d..1e48fc8af5 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -25,13 +25,9 @@ buildifier: bazel: 7.x skip_in_bazel_downstream_pipeline: "Bazel 7 required" .reusable_config: &reusable_config - # We do not enable USE_BAZEL_DIFF because this project makes heavy use of - # target_compatible_with to restrict targets/tests to compatible platforms. - # Bazel CI's built-in bazel-diff integration runs in plain query mode by - # default, which ignores compatibility. This causes it to select and schedule - # platform-incompatible tests on the wrong runners, breaking the build. - # Attempts to use the experimental EXP_USE_CQUERY=true also failed to - # resolve this reliably. + # USE_BAZEL_DIFF is disabled because Bazel CI's plain query mode ignores + # target_compatible_with, causing platform-incompatible tests to be scheduled + # on the wrong runners and breaking the build. # environment: # USE_BAZEL_DIFF: "1" build_targets: From 95be3f93264507bf9e09670828e768db5d4d9ff9 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Sun, 21 Jun 2026 03:46:25 +0000 Subject: [PATCH 3/3] style: rephrase bazel-diff comment per review --- .bazelci/presubmit.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 1e48fc8af5..79d2dfbc30 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -25,9 +25,8 @@ buildifier: bazel: 7.x skip_in_bazel_downstream_pipeline: "Bazel 7 required" .reusable_config: &reusable_config - # USE_BAZEL_DIFF is disabled because Bazel CI's plain query mode ignores - # target_compatible_with, causing platform-incompatible tests to be scheduled - # on the wrong runners and breaking the build. + # USE_BAZEL_DIFF is disabled because target_compatible_with is used heavily, + # but BazelCI's bazel-diff integration errors when handling them. # environment: # USE_BAZEL_DIFF: "1" build_targets: