Fix repository for compatibility with --incompatible_no_support_tools_in_action_inputs (#156)

This commit is contained in:
Laurent Le Brun 2019-05-23 20:07:27 +02:00 committed by GitHub
parent bf8a55b668
commit 9aa308e1ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -48,7 +48,7 @@ def copy_cmd(ctx, src, dst):
def copy_bash(ctx, src, dst):
ctx.actions.run_shell(
inputs = [src],
tools = [src],
outputs = [dst],
command = "cp -f \"$1\" \"$2\"",
arguments = [src.path, dst.path],

View File

@ -23,7 +23,7 @@ load("//lib:dicts.bzl", "dicts")
def _impl(ctx):
tool_as_list = [ctx.attr.tool]
tool_inputs, tool_input_mfs = ctx.resolve_tools(tools = tool_as_list)
args = [
args = [
# Expand $(location) / $(locations) in args.
#
# To keep the rule simple, do not expand Make Variables (like *_binary.args usually would).
@ -44,7 +44,8 @@ def _impl(ctx):
}
ctx.actions.run(
outputs = ctx.outputs.outs,
inputs = depset(direct = ctx.files.srcs, transitive = [tool_inputs]),
inputs = ctx.files.srcs,
tools = tool_inputs,
executable = ctx.executable.tool,
arguments = args,
mnemonic = "RunBinary",