Add rules_shell dep to rules_bazel_integration_test (#368)

ted-xie · cgrindel · web-flow · commit 0b8c5cae758e · 2024-10-18T21:11:42.000Z
native.{sh_test,sh_library} no longer exist in Bazel HEAD.

---------

Co-authored-by: Chuck Grindel &lt;chuck@revealtech.ai&gt;
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 # Ignore Bazel symlinks
 bazel-*
-
+MODULE.bazel.lock
 
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -7,6 +7,7 @@ bazel_dep(name = "bazel_skylib", version = "1.4.1")
 bazel_dep(name = "rules_python", version = "0.19.0")
 bazel_dep(name = "platforms", version = "0.0.7")
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.0")
+bazel_dep(name = "rules_shell", version = "0.2.0")
 
 # not a direct dependency, but required here for bazel starlib's difftest macros to work
 bazel_dep(
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/WORKSPACE b/WORKSPACE
@@ -62,3 +62,16 @@ http_file(
     sha256 = "0baf36f9c3ef9d8b4833833e1d633707965c9850f69f04dd96712672b9e75cc0",
     url = "https://raw.githubusercontent.com/bazel-contrib/rules_bazel_integration_test/v0.12.0/.bazelversion",
 )
+
+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()
diff --git a/bazel_integration_test/bzlmod/BUILD.bazel b/bazel_integration_test/bzlmod/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@bazel_binaries//:defs.bzl", "bazel_binaries")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
diff --git a/bazel_integration_test/private/BUILD.bazel b/bazel_integration_test/private/BUILD.bazel
@@ -41,6 +41,7 @@ bzl_library(
         ":integration_test_utils",
         "@bazel_skylib//lib:paths",
         "@bazel_skylib//rules:select_file",
+        "@rules_shell//shell:rules_bzl",
     ],
 )
 
diff --git a/bazel_integration_test/private/bazel_integration_test.bzl b/bazel_integration_test/private/bazel_integration_test.bzl
@@ -3,6 +3,7 @@ an integration test.\
 """
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load(":integration_test_utils.bzl", "integration_test_utils")
 
 # This was lovingly inspired by
@@ -168,7 +169,7 @@ def bazel_integration_test(
 
     env["BIT_STARTUP_OPTIONS"] = startup_options
 
-    native.sh_test(
+    sh_test(
         name = name,
         srcs = [
             "@rules_bazel_integration_test//bazel_integration_test/private:integration_test_wrapper.sh",
diff --git a/bazel_integration_test/private/script_test.bzl b/bazel_integration_test/private/script_test.bzl
@@ -1,5 +1,6 @@
 "A facility for script tests that create workspaces and call Bazel."
 
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(
     "//bazel_integration_test/private:bazel_integration_test.bzl",
     "bazel_integration_test",
@@ -98,7 +99,7 @@ def script_test(
     )
 
     # Create the test runner that sets up and calls the test.
-    native.sh_binary(
+    sh_binary(
         name = runner_target,
         testonly = True,
         srcs = [runner_script],
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@bazel_binaries//:defs.bzl", "bazel_binaries")
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
diff --git a/release/BUILD.bazel b/release/BUILD.bazel
@@ -11,6 +11,7 @@ load(
     "release_archive",
     "update_readme",
 )
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(
     "//bazel_integration_test:defs.bzl",
     "bazel_integration_test",
@@ -75,7 +76,7 @@ sh_binary(
     name = "archive_test_runner",
     testonly = True,
     srcs = ["archive_test_runner.sh"],
-    data = ["//release:archive"],
+    data = [":archive"],
     deps = [
         "@bazel_tools//tools/bash/runfiles",
         "@cgrindel_bazel_starlib//shlib/lib:assertions",
diff --git a/tests/tools_tests/BUILD.bazel b/tests/tools_tests/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 bzlformat_pkg(name = "bzlformat")
 
diff --git a/tests/tools_tests/shared_fns_tests/BUILD.bazel b/tests/tools_tests/shared_fns_tests/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 bzlformat_pkg(name = "bzlformat")
 
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 exports_files(["fake_bazel.sh"])
 

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 # Ignore Bazel symlinks
 bazel-*
+-
 +MODULE.bazel.lock
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ bzl_library(`
`41`	`41`	`":integration_test_utils",`
`42`	`42`	`"@bazel_skylib//lib:paths",`
`43`	`43`	`"@bazel_skylib//rules:select_file",`
	`44`	`+ "@rules_shell//shell:rules_bzl",`
`44`	`45`	`],`
`45`	`46`	`)`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")`
	`2`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`2`	`3`
`3`	`4`	`bzlformat_pkg(name = "bzlformat")`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")`
	`2`	`+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")`
`2`	`3`
`3`	`4`	`exports_files(["fake_bazel.sh"])`
`4`	`5`