diff options
| author | Keith Smiley <keithbsmiley@gmail.com> | 2020-11-10 09:48:10 -0800 |
|---|---|---|
| committer | David Ostrovsky <david.ostrovsky@gmail.com> | 2020-11-24 19:19:28 +0000 |
| commit | 7e22ca2291656d1949f56ed1cdc00f0a54267656 (patch) | |
| tree | 26be6f83ebf04cb427ad594593e8f050cae6553e | |
| parent | 7afd9bc971d66db6623c1c6d15a112d7a5bf2289 (diff) | |
Fix bazel run_shell usage for newer versions
The Bazel option `--incompatible_run_shell_command_string` is going to be flipped to true in upcoming Bazel 4.0 release per default, see: [1] for more details.
Test Plan:
bazel build :release
[1] https://github.com/bazelbuild/bazel/issues/5903
Bug: Issue 13612
Change-Id: Icc9589906198386b1e4805ceeabbb420a7ea1afb
(cherry picked from commit c1f4e91406b9da411dd2f5eab4ee92bfc761e1f4)
| -rw-r--r-- | tools/bzl/asciidoc.bzl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/bzl/asciidoc.bzl b/tools/bzl/asciidoc.bzl index 1e7ec96ce3..7977cf051d 100644 --- a/tools/bzl/asciidoc.bzl +++ b/tools/bzl/asciidoc.bzl @@ -18,8 +18,7 @@ def documentation_attributes(): ] def _replace_macros_impl(ctx): - cmd = [ - ctx.file._exe.path, + args = [ "--suffix", ctx.attr.suffix, "-s", @@ -28,13 +27,14 @@ def _replace_macros_impl(ctx): ctx.outputs.out.path, ] if ctx.attr.searchbox: - cmd.append("--searchbox") + args.append("--searchbox") else: - cmd.append("--no-searchbox") - ctx.actions.run_shell( + args.append("--no-searchbox") + ctx.actions.run( inputs = [ctx.file._exe, ctx.file.src], outputs = [ctx.outputs.out], - command = cmd, + executable = ctx.file._exe.path, + arguments = args, use_default_shell_env = True, progress_message = "Replacing macros in %s" % ctx.file.src.short_path, ) |