From 99bba9ea5d787bbfcb2937406aa76b44163de72f Mon Sep 17 00:00:00 2001 From: Vladimir Moskva Date: Tue, 4 Feb 2025 16:58:19 +0100 Subject: [PATCH] Explicitly load shell rules --- MODULE.bazel | 1 + build/build_defs.bzl | 6 ++++-- buildifier/BUILD.bazel | 1 + buildozer/BUILD.bazel | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index c2edaa39f..df47908d4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -12,6 +12,7 @@ bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf" bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go") bazel_dep(name = "rules_nodejs", version = "6.3.2") bazel_dep(name = "rules_proto", version = "7.0.2") +bazel_dep(name = "rules_shell", version = "0.4.0") # -- bazel_dep definitions -- # go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") diff --git a/build/build_defs.bzl b/build/build_defs.bzl index 04462607e..6a27dde7a 100644 --- a/build/build_defs.bzl +++ b/build/build_defs.bzl @@ -19,6 +19,8 @@ load( "@io_bazel_rules_go//go:def.bzl", "GoSource", ) +load("@rules_shell//shell:sh_binary.bzl", "sh_binary") +load("@rules_shell//shell:sh_test.bzl", "sh_test") _GO_YACC_TOOL = "@org_golang_x_tools//cmd/goyacc" @@ -130,7 +132,7 @@ diff -q "$$F1" "$$F2" eof """, ) - native.sh_test( + sh_test( name = src + "_checkshtest", size = "small", srcs = [src + "_check.sh"], @@ -147,7 +149,7 @@ eof cmd = "echo 'cp $${BUILD_WORKSPACE_DIRECTORY}/$(location " + gen + ") $${BUILD_WORKSPACE_DIRECTORY}/" + native.package_name() + "/" + src + "' > $@", ) - native.sh_binary( + sh_binary( name = src + "_copy", srcs = [src + "_copysh"], data = [gen], diff --git a/buildifier/BUILD.bazel b/buildifier/BUILD.bazel index 860cc7ed5..0725808ef 100644 --- a/buildifier/BUILD.bazel +++ b/buildifier/BUILD.bazel @@ -1,4 +1,5 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +load("@rules_shell//shell:sh_test.bzl", "sh_test") go_binary( name = "buildifier", diff --git a/buildozer/BUILD.bazel b/buildozer/BUILD.bazel index 58ef815c3..fa668ff37 100644 --- a/buildozer/BUILD.bazel +++ b/buildozer/BUILD.bazel @@ -1,4 +1,5 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +load("@rules_shell//shell:sh_test.bzl", "sh_test") go_library( name = "buildozer_lib",