commit 1ff392c5fb2db95844fc543dddf697ce50fb0255
author David Ostrovsky <david@ostrovsky.org> Tue Apr 02 09:02:30 2019 +0200
committer Luca Milanesio <luca.milanesio@gmail.com> Tue Apr 02 06:35:02 2019 +0000
tree 7e0b3ae265e0d7117c3bc02f4d8b89b7ff285b9c
parent 016d6a2c016870cc1d437c64e15e78fd278504b9

Remove setup for google-java-format 1.6

Change-Id: Ieae22d18d2107a708a621f7fe0c5883f95010eef

jenkins-docker/slave-bazel/Dockerfile

diff --git a/jenkins-docker/slave-bazel/Dockerfile b/jenkins-docker/slave-bazel/Dockerfile
index cba404f..c888e15 100644
--- a/jenkins-docker/slave-bazel/Dockerfile
+++ b/jenkins-docker/slave-bazel/Dockerfile
@@ -4,9 +4,8 @@
 # Set-up google-java-format utility to ~/format/google-java-format
 USER jenkins
 RUN bash -c '. /usr/bin/set-java.sh 8 && \
-    cd /tmp &&  git clone -b stable-2.15 --recursive https://gerrit.googlesource.com/gerrit && \
+    cd /tmp && git clone -b stable-2.15 --recursive https://gerrit.googlesource.com/gerrit && \
     cd /tmp/gerrit && \
-    ./tools/setup_gjf.sh 1.6 && \
     ./tools/setup_gjf.sh 1.7 && \
     ( bazel build //... || true ) && \
     git checkout -f stable-2.16 && git submodule update --init && ( bazel build //... || true ) && \