test: use rules_shell for sh_* in tests

jbedard · jbedard · commit c75a83f4049e · 2025-10-09T14:38:02.000-07:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -53,6 +53,7 @@ use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
 bazel_dep(name = "bazelrc-preset.bzl", version = "1.3.0", dev_dependency = True)
 bazel_dep(name = "aspect_rules_lint", version = "1.1.0", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "8.0.1", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
 
 # Overrides of non-dev deps for local testing using recent versions
 archive_override(
diff --git a/e2e/git_dep_metadata/BUILD.bazel b/e2e/git_dep_metadata/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
+
 # Test that a package imported directly from a git repository has its
 # .git folder removed.
 sh_test(
diff --git a/e2e/git_dep_metadata/MODULE.bazel b/e2e/git_dep_metadata/MODULE.bazel
@@ -4,6 +4,8 @@ local_path_override(
     path = "../..",
 )
 
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
+
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
     "npm",
diff --git a/e2e/git_dep_metadata/WORKSPACE b/e2e/git_dep_metadata/WORKSPACE
@@ -1,3 +1,5 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 local_repository(
     name = "aspect_rules_js",
     path = "../..",
@@ -11,6 +13,13 @@ load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_re
 
 rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
 
+http_archive(
+    name = "rules_shell",
+    sha256 = "e6b87c89bd0b27039e3af2c5da01147452f240f75d505f5b6880874f31036307",
+    strip_prefix = "rules_shell-0.6.1",
+    url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz",
+)
+
 load("@aspect_rules_js//npm:repositories.bzl", "npm_import")
 
 npm_import(
diff --git a/e2e/npm_translate_lock_exclude_package_contents/BUILD.bazel b/e2e/npm_translate_lock_exclude_package_contents/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 npm_link_all_packages(name = "node_modules")
 
diff --git a/e2e/npm_translate_lock_exclude_package_contents/MODULE.bazel b/e2e/npm_translate_lock_exclude_package_contents/MODULE.bazel
@@ -7,6 +7,7 @@ local_path_override(
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
 
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
diff --git a/e2e/npm_translate_lock_exclude_package_contents/WORKSPACE b/e2e/npm_translate_lock_exclude_package_contents/WORKSPACE
@@ -1,8 +1,17 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 local_repository(
     name = "aspect_rules_js",
     path = "../..",
 )
 
+http_archive(
+    name = "rules_shell",
+    sha256 = "e6b87c89bd0b27039e3af2c5da01147452f240f75d505f5b6880874f31036307",
+    strip_prefix = "rules_shell-0.6.1",
+    url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz",
+)
+
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
diff --git a/e2e/pnpm_workspace/BUILD.bazel b/e2e/pnpm_workspace/BUILD.bazel
@@ -3,6 +3,7 @@
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 npm_link_all_packages(name = "node_modules")
 
diff --git a/e2e/pnpm_workspace/MODULE.bazel b/e2e/pnpm_workspace/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
 
 node = use_extension(
     "@rules_nodejs//nodejs:extensions.bzl",
diff --git a/e2e/pnpm_workspace/WORKSPACE b/e2e/pnpm_workspace/WORKSPACE
@@ -1,10 +1,18 @@
 # NOTE: keep in sync with e2e/pnpm_workspace(_rerooted)
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 local_repository(
     name = "aspect_rules_js",
     path = "../..",
 )
 
+http_archive(
+    name = "rules_shell",
+    sha256 = "e6b87c89bd0b27039e3af2c5da01147452f240f75d505f5b6880874f31036307",
+    strip_prefix = "rules_shell-0.6.1",
+    url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz",
+)
+
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
diff --git a/e2e/pnpm_workspace_rerooted/BUILD.bazel b/e2e/pnpm_workspace_rerooted/BUILD.bazel
@@ -3,6 +3,7 @@
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 npm_link_all_packages(name = "node_modules")
 
diff --git a/e2e/pnpm_workspace_rerooted/MODULE.bazel b/e2e/pnpm_workspace_rerooted/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "rules_nodejs", version = "6.3.0", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
 
 node = use_extension(
     "@rules_nodejs//nodejs:extensions.bzl",
diff --git a/e2e/pnpm_workspace_rerooted/WORKSPACE b/e2e/pnpm_workspace_rerooted/WORKSPACE
@@ -1,10 +1,18 @@
 # NOTE: keep in sync with e2e/pnpm_workspace(_rerooted)
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 local_repository(
     name = "aspect_rules_js",
     path = "../..",
 )
 
+http_archive(
+    name = "rules_shell",
+    sha256 = "e6b87c89bd0b27039e3af2c5da01147452f240f75d505f5b6880874f31036307",
+    strip_prefix = "rules_shell-0.6.1",
+    url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz",
+)
+
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
diff --git a/examples/js_binary/BUILD.bazel b/examples/js_binary/BUILD.bazel
@@ -13,6 +13,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary", "js_test")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@npm//examples/npm_deps:@aspect-test/a/package_json.bzl", aspect_test_a_bin = "bin")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(":custom_rule.bzl", "custom_rule")
 
 # Link all direct dependencies in /examples/npm_deps/package.json to
diff --git a/npm/private/test/BUILD.bazel b/npm/private/test/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load(":generated_pkg_json_test.bzl", "generated_pkg_json_test")
 load(":npm_auth_test.bzl", "npm_auth_test_suite")
 load(":npmrc_test.bzl", "npmrc_tests")
diff --git a/npm/private/test/npm_package_publish/BUILD.bazel b/npm/private/test/npm_package_publish/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//npm:defs.bzl", "npm_package")
 
 npm_package(

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
	`2`	`+`
`1`	`3`	`# Test that a package imported directly from a git repository has its`
`2`	`4`	`# .git folder removed.`
`3`	`5`	`sh_test(`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ local_path_override(`
`4`	`4`	`path = "../..",`
`5`	`5`	`)`
`6`	`6`
	`7`	`+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)`
	`8`	`+`
`7`	`9`	`npm = use_extension(`
`8`	`10`	`"@aspect_rules_js//npm:extensions.bzl",`
`9`	`11`	`"npm",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@npm//:defs.bzl", "npm_link_all_packages")`
	`2`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`2`	`3`
`3`	`4`	`npm_link_all_packages(name = "node_modules")`
`4`	`5`