Skip to content

Commit 4240c66

Browse files
committed
[8.3.0] Move Bash runfiles libraries out of Bazel
The Bash libraries in `@bazel_tools` are replaced with aliases to `@rules_shell//shell/runfiles`. This requires skipping load visibility checks for resolved WORKSPACE files, which are going away anyway. Closes bazelbuild#24219. PiperOrigin-RevId: 727843225 Change-Id: I00744bd30c637cae450d63b859b87abf89e56b7c (cherry picked from commit b8b91e4)
1 parent d8c7af4 commit 4240c66

File tree

10 files changed

+73
-962
lines changed

10 files changed

+73
-962
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ bazel_dep(name = "rules_testing", version = "0.6.0")
3333
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
3434
bazel_dep(name = "with_cfg.bzl", version = "0.6.0")
3535
bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.2")
36-
bazel_dep(name = "rules_shell", version = "0.2.0")
36+
bazel_dep(name = "rules_shell", version = "0.3.0")
3737
bazel_dep(name = "chicory", version = "1.1.0")
3838

3939
# Depend on apple_support first and then rules_cc so that the Xcode toolchain

MODULE.bazel.lock

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ filegroup(
649649
"@rules_license//:WORKSPACE",
650650
"@rules_pkg//:WORKSPACE",
651651
"@rules_python//:WORKSPACE",
652+
"@rules_shell//shell:rules_bzl",
652653
"@rules_testing//:LICENSE",
653654
] + select({
654655
"//src/conditions:linux_x86_64": ["@remotejdk%s_linux//:WORKSPACE" % v for v in JDK_VERSIONS],

src/MODULE.tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf"
4141
bazel_dep(name = "rules_java", version = "8.12.0")
4242
bazel_dep(name = "rules_cc", version = "0.1.1")
4343
bazel_dep(name = "rules_python", version = "0.40.0")
44-
bazel_dep(name = "rules_shell", version = "0.2.0")
44+
bazel_dep(name = "rules_shell", version = "0.3.0")
4545
# add rules_android
4646
# add apple_support
4747

src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ gen_workspace_stanza(
141141
protobuf_deps()
142142
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
143143
rules_java_toolchains()
144+
load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
145+
rules_shell_dependencies()
146+
rules_shell_toolchains()
144147
""",
145148
preamble = """
146149
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -153,6 +156,7 @@ gen_workspace_stanza(
153156
"rules_cc", # For auto-load cc rules symbols
154157
"rules_python", # For auto-load python rules symbols
155158
"rules_license", # for license attestations
159+
"rules_shell", # For auto-load of shell rules symbols
156160
],
157161
use_maybe = 1,
158162
visibility = ["//:__pkg__"],

0 commit comments

Comments
 (0)