diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2019-11-22 21:40:13 -0800 |
|---|---|---|
| committer | David Ostrovsky <david.ostrovsky@gmail.com> | 2019-11-23 06:15:46 +0000 |
| commit | 9c7428264769e9c211c0cf23a2d6ec9406be791b (patch) | |
| tree | 9bf8e99ad5c7960082453057286b0d212b0fda9c | |
| parent | b2127602d4b9ed1b5c158d374052a5e315414121 (diff) | |
Bazel: Consistently use bazelisk during publishing of artifacts
Change-Id: I1e3d7ceaf7908f3b53a5b11a257aa752eaec066e
| -rw-r--r-- | tools/maven/package.bzl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/maven/package.bzl b/tools/maven/package.bzl index 5b497f83b6..ce60db9ebc 100644 --- a/tools/maven/package.bzl +++ b/tools/maven/package.bzl @@ -17,6 +17,14 @@ sh_bang_template = (" && ".join([ "echo \"# this script should run from the root of your workspace.\" >> $@", "echo \"set -e\" >> $@", "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 \"\" >> $@", "echo %s >> $@", @@ -32,7 +40,7 @@ def maven_package( src = {}, doc = {}, war = {}): - build_cmd = ["bazel", "build"] + build_cmd = ["bazel_cmd", "build"] mvn_cmd = ["python", "tools/maven/mvn.py", "-v", version] api_cmd = mvn_cmd[:] api_targets = [] |