diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2018-06-23 08:24:40 +0200 |
|---|---|---|
| committer | Paladox none <thomasmulhall410@yahoo.com> | 2019-04-05 12:27:56 +0000 |
| commit | 62bed51f12bd61d7289e83e4aa5d201f22f002fb (patch) | |
| tree | 687585c18064dfc63f9a0ff119247b82726f728a | |
| parent | a1d98360a114074494fab8d92f29d635a6c6aa13 (diff) | |
Bazel: Avoid using tools in action inputs
Recent bazel version added an option to ensure, that tools are not used
in input, but instead passed as new parameter tools: [1].
Test Plan:
$ bazel build --incompatible_no_support_tools_in_action_inputs //...
[1] https://docs.bazel.build/versions/master/skylark/backward-compatibility.html#disallow-tools-in-action-inputs
Change-Id: I744ae1b28adac7d10037b445761c9dca771738bc
(cherry picked from commit 6af7e76bb26c6f5c64bfc02a5707a7f4478b33e7)
| -rw-r--r-- | tools/bzl/asciidoc.bzl | 3 | ||||
| -rw-r--r-- | tools/bzl/gwt.bzl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/bzl/asciidoc.bzl b/tools/bzl/asciidoc.bzl index 42b3d9ae76..ca7b51e4f4 100644 --- a/tools/bzl/asciidoc.bzl +++ b/tools/bzl/asciidoc.bzl @@ -222,7 +222,8 @@ def _asciidoc_html_zip_impl(ctx): ] args.extend(_generate_asciidoc_args(ctx)) ctx.actions.run( - inputs = ctx.files.srcs + [ctx.executable._exe, ctx.file.version], + inputs = ctx.files.srcs + [ctx.file.version], + tools = [ctx.executable._exe], outputs = [ctx.outputs.out], executable = ctx.executable._exe, arguments = args, diff --git a/tools/bzl/gwt.bzl b/tools/bzl/gwt.bzl index 467e949a6a..3ee106ac8a 100644 --- a/tools/bzl/gwt.bzl +++ b/tools/bzl/gwt.bzl @@ -192,8 +192,9 @@ def _gwt_binary_impl(ctx): ]) ctx.actions.run_shell( - inputs = list(deps) + ctx.files._jdk + ctx.files._zip + gwt_user_agent_modules, + inputs = list(deps) + gwt_user_agent_modules, outputs = [output_zip], + tools = ctx.files._jdk + ctx.files._zip, mnemonic = "GwtBinary", progress_message = "GWT compiling " + output_zip.short_path, command = "set -e\n" + cmd, |