opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Bump bazel version to 1.2.0
  Bazel: Consistently use bazelisk during publishing of artifacts

Change-Id: I758de3b7a8517f8e990566da6bda69fbf7e2f026
This commit is contained in:
David Ostrovsky
2019-11-23 00:24:24 -08:00
parent e3dae4e4e7 ea1f0165ad
commit f89e266203
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bazelversion
View File

@@ -1 +1 @@
1.1.0 1.2.0

10
tools/maven/package.bzl
View File

@@ -17,6 +17,14 @@ sh_bang_template = (" && ".join([
"echo \"# this script should run from the root of your workspace.\" >> $@", "echo \"# this script should run from the root of your workspace.\" >> $@",
"echo \"set -e\" >> $@", "echo \"set -e\" >> $@",
"echo \"\" >> $@", "echo \"\" >> $@",
"echo 'function bazel_cmd() {' >> $@",
"echo ' if [[ `which bazelisk` ]]; then' >> $@",
"echo ' bazelisk \"$$@\"' >> $@",
"echo ' else' >> $@",
"echo ' bazel \"$$@\"' >> $@",
"echo ' fi' >> $@",
"echo '}' >> $@",
"echo \"\" >> $@",
"echo 'if [[ \"$$VERBOSE\" ]]; then set -x ; fi' >> $@", "echo 'if [[ \"$$VERBOSE\" ]]; then set -x ; fi' >> $@",
"echo \"\" >> $@", "echo \"\" >> $@",
"echo %s >> $@", "echo %s >> $@",
@@ -32,7 +40,7 @@ def maven_package(
src = {}, src = {},
doc = {}, doc = {},
war = {}): war = {}):
build_cmd = ["bazel", "build"] build_cmd = ["bazel_cmd", "build"]
mvn_cmd = ["python", "tools/maven/mvn.py", "-v", version] mvn_cmd = ["python", "tools/maven/mvn.py", "-v", version]
api_cmd = mvn_cmd[:] api_cmd = mvn_cmd[:]
api_targets = [] api_targets = []