| commit | 582222ddaa5c13b4ba2d821cbb3fea92ccc0755e | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Sun Mar 08 13:35:46 2020 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Mon Mar 09 08:54:43 2020 +0900 |
| tree | 456e85bead9116c1d01653b5279f05b1e8a342eb | |
| parent | 3c1f12811ddaf93a08f4e6824d3a1f18079bf405 [diff] |
Upgrade buildifier to 2.0.0 in docker image Also update the build command so that the version is properly set per the comment from Vladimir Moskva on [1]. [1] https://github.com/bazelbuild/buildtools/issues/782#issuecomment-596080487 Change-Id: I21c6e79206dd10196682f47bd93e91c148df2e45
diff --git a/jenkins-docker/slave-bazel-nocache/Dockerfile b/jenkins-docker/slave-bazel-nocache/Dockerfile index 74db4d9..1ccd1f9 100644 --- a/jenkins-docker/slave-bazel-nocache/Dockerfile +++ b/jenkins-docker/slave-bazel-nocache/Dockerfile
@@ -17,7 +17,7 @@ git clone https://github.com/bazelbuild/buildtools.git && \ cd buildtools && \ git checkout ${BUILDIFIER_VER} && \ - bazel build --workspace_status_command=`pwd`/status.py //buildifier && \ + bazel build --config=release //buildifier && \ cp bazel-bin/buildifier/linux_amd64_stripped/buildifier /usr/bin && \ rm -rf /tmp/buildtools && \ buildifier --version'
diff --git a/jenkins-docker/slave-bazel-nocache/Makefile b/jenkins-docker/slave-bazel-nocache/Makefile index a88a5cb..e4a3c4e 100644 --- a/jenkins-docker/slave-bazel-nocache/Makefile +++ b/jenkins-docker/slave-bazel-nocache/Makefile
@@ -1,7 +1,7 @@ NO_CACHE=false IMAGE=gerritforge/gerrit-ci-slave-bazel:debian-stretch-nocache BAZEL_VER=2.2.0 -BUILDIFIER_VER=1.0.0 +BUILDIFIER_VER=2.0.0 BAZELISK_VER=1.1.0 NODE_VER=10 WCT_VER=6.8.0