opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Expose jsr305 in plugin API
  Bazel: Fix another usage of tools in action inputs

Change-Id: Ib8fb741c3800c44f3d6dd7f3ce9a785e4b45b026
This commit is contained in:
David Pursehouse
2019-06-30 16:24:48 +09:00
parent 13ff194ce4 48fb8520a2
commit 5adfd1b250
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/BUILD
View File

@@ -62,6 +62,7 @@ EXPORTS = [
"//lib/jackson:jackson-core", "//lib/jackson:jackson-core",
"//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet", "//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
"//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jsr305",
"//lib/log:api", "//lib/log:api",
"//lib/log:log4j", "//lib/log:log4j",
"//lib/mina:sshd", "//lib/mina:sshd",

3
tools/bzl/asciidoc.bzl
View File

@@ -100,8 +100,9 @@ def _asciidoc_impl(ctx):
] ]
args.extend(_generate_asciidoc_args(ctx)) args.extend(_generate_asciidoc_args(ctx))
ctx.actions.run( ctx.actions.run(
inputs = ctx.files.srcs + [ctx.executable._exe, ctx.file.version], inputs = ctx.files.srcs + [ctx.file.version],
outputs = ctx.outputs.outs, outputs = ctx.outputs.outs,
tools = [ctx.executable._exe],
executable = ctx.executable._exe, executable = ctx.executable._exe,
arguments = args, arguments = args,
progress_message = "Rendering asciidoctor files for %s" % ctx.label.name, progress_message = "Rendering asciidoctor files for %s" % ctx.label.name,