diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2019-11-22 21:40:13 -0800 |
|---|---|---|
| committer | Luca Milanesio <luca.milanesio@gmail.com> | 2020-06-05 16:02:45 +0000 |
| commit | ac47c36385d4bc9efa36607ffbb797b3c8308302 (patch) | |
| tree | 62df9d0b03329f67f1d5a88935237dea5b6a2230 | |
| parent | bddf5966018bf40aab4ef4b984dc258180a9a9bb (diff) | |
Bazel: Consistently use bazelisk during publishing of artifacts
Change-Id: I1e3d7ceaf7908f3b53a5b11a257aa752eaec066e
(cherry picked from commit 9c7428264769e9c211c0cf23a2d6ec9406be791b)
| -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 = [] |