Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Fix bazel run_shell usage for newer versions
Change-Id: I8abcf83cb4886f18a340eda46e560a10e0060ebd
diff --git a/tools/bzl/asciidoc.bzl b/tools/bzl/asciidoc.bzl
index 1e7ec96..7977cf0 100644
--- a/tools/bzl/asciidoc.bzl
+++ b/tools/bzl/asciidoc.bzl
@@ -18,8 +18,7 @@
]
def _replace_macros_impl(ctx):
- cmd = [
- ctx.file._exe.path,
+ args = [
"--suffix",
ctx.attr.suffix,
"-s",
@@ -28,13 +27,14 @@
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,
)
