Skip to content

fix: use merge_all() to avoid O(n)-depth runfiles NestedSet nesting #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keith merged 1 commit into from
Jun 11, 2026
Merged

fix: use merge_all() to avoid O(n)-depth runfiles NestedSet nesting #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions command.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,22 @@ def _expand_and_quote(*, ctx, attr, string, targets):
return shell.quote(expanded)

def _command_impl(ctx):
runfiles = ctx.runfiles().merge(ctx.attr._bash_runfiles[DefaultInfo].default_runfiles)
transitive_runfiles = [ctx.attr._bash_runfiles[DefaultInfo].default_runfiles]

for data_dep in ctx.attr.data:
default_runfiles = data_dep[DefaultInfo].default_runfiles
if default_runfiles != None:
runfiles = runfiles.merge(default_runfiles)
transitive_runfiles.append(default_runfiles)

command = ctx.attr.command if type(ctx.attr.command) == "Target" else ctx.attr.command[0]
default_info = command[DefaultInfo]
executable = default_info.files_to_run.executable

default_runfiles = default_info.default_runfiles
if default_runfiles != None:
runfiles = runfiles.merge(default_runfiles)
transitive_runfiles.append(default_runfiles)

runfiles = ctx.runfiles().merge_all(transitive_runfiles)

expansion_targets = ctx.attr.data

Expand Down
13 changes: 8 additions & 5 deletions multirun.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,15 @@ def _multirun_impl(ctx):
runner_info = ctx.attr._runner[DefaultInfo]
runner_exe = runner_info.files_to_run.executable

runfiles = ctx.runfiles(files = [instructions_file, runner_exe])
runfiles = runfiles.merge(ctx.attr._bash_runfiles[DefaultInfo].default_runfiles)
runfiles = runfiles.merge(runner_info.default_runfiles)
transitive_runfiles = [
ctx.attr._bash_runfiles[DefaultInfo].default_runfiles,
runner_info.default_runfiles,
]

for data_dep in ctx.attr.data:
default_runfiles = data_dep[DefaultInfo].default_runfiles
if default_runfiles != None:
runfiles = runfiles.merge(default_runfiles)
transitive_runfiles.append(default_runfiles)

commands = []
tagged_commands = []
Expand All @@ -87,7 +88,7 @@ def _multirun_impl(ctx):

default_runfiles = default_info.default_runfiles
if default_runfiles != None:
runfiles = runfiles.merge(default_runfiles)
transitive_runfiles.append(default_runfiles)

if CommandInfo in command:
tag = command[CommandInfo].description
Expand All @@ -101,6 +102,8 @@ def _multirun_impl(ctx):
env = env,
))

runfiles = ctx.runfiles(files = [instructions_file, runner_exe]).merge_all(transitive_runfiles)

if ctx.attr.jobs < 0:
fail("'jobs' attribute should be at least 0")
elif ctx.attr.jobs > 0 and ctx.attr.forward_stdin:
Expand Down
Loading