Minor cleanup of CI pipelines (#1534)
* Minor cleanup of CI pipelines
* Forgot minus
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index ac6b419..b30b5fe 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -4,8 +4,6 @@
- "--config=clippy"
default_linux_targets: &default_linux_targets
- "//..."
- # TODO: Switch manual tag to platform constraint after bazel 4.0.
- - "//test/versioned_dylib:versioned_dylib_test"
default_macos_targets: &default_macos_targets
- "--"
- "//..."
@@ -37,6 +35,8 @@
- "//..."
- "//test/..."
- "-//test/conflicting_deps:conflicting_deps_test"
+ # TODO: This test does not work on RBE
+ - "-//test/versioned_dylib:versioned_dylib_test"
macos:
build_targets: *default_macos_targets
test_targets: *default_macos_targets
@@ -67,6 +67,8 @@
- "..."
- "//test/..."
- "-//test/conflicting_deps:conflicting_deps_test"
+ # TODO: This test does not work on RBE
+ - "-//test/versioned_dylib:versioned_dylib_test"
build_flags: *aspects_flags
rbe_ubuntu1604_rolling_with_aspects:
name: RBE Rolling Bazel Version With Aspects
@@ -80,6 +82,8 @@
- "..."
- "//test/..."
- "-//test/conflicting_deps:conflicting_deps_test"
+ # TODO: This test does not work on RBE
+ - "-//test/versioned_dylib:versioned_dylib_test"
build_flags: *aspects_flags
soft_fail: yes
bazel: "rolling"
diff --git a/test/versioned_dylib/BUILD.bazel b/test/versioned_dylib/BUILD.bazel
index fd0298f..3eb5209 100644
--- a/test/versioned_dylib/BUILD.bazel
+++ b/test/versioned_dylib/BUILD.bazel
@@ -8,7 +8,10 @@
"src/main.rs",
],
edition = "2018",
- tags = ["manual"],
+ target_compatible_with = select({
+ "@platforms//os:linux": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
deps = [
"//test/versioned_dylib/c:libreturn_zero",
"@libc",
@@ -19,5 +22,8 @@
name = "versioned_dylib_test",
crate = "versioned_dylib",
edition = "2018",
- tags = ["manual"],
+ target_compatible_with = select({
+ "@platforms//os:linux": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
)
