diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 5929c96..9e66335 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -5,14 +5,12 @@ build_targets: &build_targets - "//examples/..." - "//tests/..." - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - - "-//tests/rule_based_toolchain/tool_map:_duplicate_tool_test_subject" # Intentionally broken rule. test_targets: &test_targets - "//:all" - "//cc/..." - "//examples/..." - "//tests/..." - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - - "-//tests/rule_based_toolchain/tool_map:_duplicate_tool_test_subject" # Intentionally broken rule. build_targets_bazel_6: &build_targets_bazel_6 - "//:all" @@ -22,7 +20,6 @@ build_targets_bazel_6: &build_targets_bazel_6 - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//tests/rule_based_toolchain/..." # proto.encode_text doesn't support None - "-//cc:optional_current_cc_toolchain" # Not supported in Bazel 6 - - "-//tests/rule_based_toolchain/tool_map:_duplicate_tool_test_subject" # Intentionally broken rule. test_targets_bazel_6: &test_targets_bazel_6 - "//:all" - "//cc:all" @@ -31,7 +28,6 @@ test_targets_bazel_6: &test_targets_bazel_6 - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//tests/rule_based_toolchain/..." # proto.encode_text doesn't support None - "-//cc:optional_current_cc_toolchain" # Not supported in Bazel 6 - - "-//tests/rule_based_toolchain/tool_map:_duplicate_tool_test_subject" # Intentionally broken rule. buildifier: version: latest @@ -79,7 +75,6 @@ tasks: - "//tests/..." - "-//examples/custom_toolchain:legacy_selector" # Example only works on Linux - "-//tests/system_library:system_library_test" # Fails because of repo setup - - "-//tests/rule_based_toolchain/tool_map:_duplicate_tool_test_subject" # Intentionally broken rule. macos_head: name: MacOS (Bazel HEAD) bazel: last_green diff --git a/MODULE.bazel b/MODULE.bazel index 311dc50..6b93849 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -13,5 +13,6 @@ use_repo(cc_configure, "local_config_cc", "local_config_cc_toolchains") register_toolchains("@local_config_cc_toolchains//:all") +bazel_dep(name = "rules_shell", version = "0.2.0", dev_dependency = True) bazel_dep(name = "rules_testing", version = "0.6.0", dev_dependency = True) bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True) diff --git a/WORKSPACE b/WORKSPACE index 114cb06..4955620 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -24,6 +24,19 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() +http_archive( + name = "rules_shell", + sha256 = "410e8ff32e018b9efd2743507e7595c26e2628567c42224411ff533b57d27c28", + strip_prefix = "rules_shell-0.2.0", + url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.2.0/rules_shell-v0.2.0.tar.gz", +) + +load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains") + +rules_shell_dependencies() + +rules_shell_toolchains() + http_archive( name = "rules_testing", sha256 = "02c62574631876a4e3b02a1820cb51167bb9cdcdea2381b2fa9d9b8b11c407c4", diff --git a/tests/system_library/BUILD b/tests/system_library/BUILD index 3c8d577..5672fc2 100644 --- a/tests/system_library/BUILD +++ b/tests/system_library/BUILD @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//third_party/rules_shell/shell:sh_test.bzl", "sh_test") + sh_test( name = "system_library_test", size = "small",