Minor cleanup of .bazelrc and presubmit.yaml

bazelbuild · Dec 17, 2023 · 346ade2 · 346ade2
1 parent 9e146e5
commit 346ade2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 30 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -56,15 +56,8 @@ tasks:
     shell_commands:
       - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
-    build_targets:
-      - "--"
-      - "//..."
-    test_targets:
-      - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-      - "//..."
-      - "-//test/conflicting_deps:conflicting_deps_test"
-      # TODO: This test does not work on RBE
-      - "-//test/versioned_dylib:versioned_dylib_test"
+    build_targets: *default_linux_targets
+    test_targets: *default_linux_targets
   macos:
     build_targets: *default_macos_targets
     test_targets: *default_macos_targets
@@ -126,27 +119,17 @@ tasks:
     shell_commands:
       - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
-    build_targets: *default_linux_targets
-    test_targets:
-      - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-      - "//..."
-      - "-//test/conflicting_deps:conflicting_deps_test"
-      # TODO: This test does not work on RBE
-      - "-//test/versioned_dylib:versioned_dylib_test"
     build_flags: *aspects_flags
+    build_targets: *default_linux_targets
+    test_targets: *default_linux_targets
   rbe_ubuntu2004_rolling_with_aspects:
     name: RBE Rolling Bazel Version With Aspects
     platform: rbe_ubuntu2004
     shell_commands:
       - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_targets: *default_linux_targets
-    test_targets:
-      - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-      - "//..."
-      - "-//test/conflicting_deps:conflicting_deps_test"
-      # TODO: This test does not work on RBE
-      - "-//test/versioned_dylib:versioned_dylib_test"
+    test_targets: *default_linux_targets
     build_flags: *aspects_flags
     soft_fail: yes
     bazel: "rolling"

diff --git a/.bazelrc b/.bazelrc
@@ -42,14 +42,6 @@ build --incompatible_disallow_empty_glob=true
 # https://github.com/bazelbuild/bazel/issues/12821
 build --nolegacy_external_runfiles
 
-###############################################################################
-## Custom user flags
-##
-## This should always be the last thing in the `.bazelrc` file to ensure
-## consistent behavior when setting flags in that file as `.bazelrc` files are
-## evaluated top to bottom.
-###############################################################################
-
 ###############################################################################
 ## Bzlmod
 ###############################################################################
@@ -58,4 +50,12 @@ build --nolegacy_external_runfiles
 # https://github.com/bazelbuild/rules_rust/issues/2181
 common --noenable_bzlmod
 
+###############################################################################
+## Custom user flags
+##
+## This should always be the last thing in the `.bazelrc` file to ensure
+## consistent behavior when setting flags in that file as `.bazelrc` files are
+## evaluated top to bottom.
+###############################################################################
+
 try-import %workspace%/user.bazelrc