Skip to content

Commit 83e80a5

Browse files
authored
Fix runfiles merging for @bazel_tools//tools/bash/runfiles (#184)
This is required in Bazel 8.3.0, where this target gained runfiles.
1 parent b9c9d69 commit 83e80a5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

skylib/run_in_workspace.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ cd $(dirname $(readlink {root_file}))
5252
files = [
5353
ctx.file.cmd,
5454
ctx.file.root_file,
55-
] + ctx.files._bash_runfiles,
55+
],
5656
)
57+
runfiles = runfiles.merge(ctx.attr._bash_runfiles[DefaultInfo].default_runfiles)
5758
return [DefaultInfo(runfiles = runfiles)]
5859

5960
_workspace_binary_script = rule(
@@ -67,7 +68,6 @@ _workspace_binary_script = rule(
6768
allow_single_file = True,
6869
),
6970
"_bash_runfiles": attr.label(
70-
allow_files = True,
7171
default = "@bazel_tools//tools/bash/runfiles",
7272
),
7373
},

0 commit comments

Comments
 (0)