opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Bazel: Fix asciidoc.bzl python invocation
  Update jruby and asciidoctorj

Change-Id: Ibf1dc34ab62353cb6021d2ca505174a8706950df
This commit is contained in:
Dave Borowitz
2017-10-30 13:56:04 -04:00
parent 86624f3220 9c383c3a13
commit ae421ae49b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WORKSPACE
View File

@@ -909,14 +909,14 @@ maven_jar(
maven_jar(
name = "asciidoctor",
artifact = "org.asciidoctor:asciidoctorj:1.5.4.1",
sha1 = "f7ddfb2bbed2f8da3f9ad0d1a5514f04b4274a5a",
artifact = "org.asciidoctor:asciidoctorj:1.5.6",
sha1 = "bb757d4b8b0f8438ce2ed781f6688cc6c01d9237",
)
maven_jar(
name = "jruby",
artifact = "org.jruby:jruby-complete:9.1.5.0",
sha1 = "00d0003e99da3c4d830b12c099691ce910c84e39",
artifact = "org.jruby:jruby-complete:9.1.13.0",
sha1 = "8903bf42272062e87a7cbc1d98919e0729a9939f",
)
# When upgrading Elasticsearch, make sure it's compatible with Lucene

1
tools/bzl/asciidoc.bzl
View File

@@ -47,6 +47,7 @@ def _replace_macros_impl(ctx):
inputs = [ctx.file._exe, ctx.file.src],
outputs = [ctx.outputs.out],
command = cmd,
use_default_shell_env = True,
progress_message = "Replacing macros in %s" % ctx.file.src.short_path,
)