env/commit-watcher: bump commit watcher version, build with go1.5
Change-Id: I44625aea7b51a4ddb8c61dc9ba2ada93cd99ef1d
Reviewed-on: https://go-review.googlesource.com/14353
Reviewed-by: Andrew Gerrand <adg@golang.org>
diff --git a/env/commit-watcher/Dockerfile b/env/commit-watcher/Dockerfile
index d814fa7..a652056 100644
--- a/env/commit-watcher/Dockerfile
+++ b/env/commit-watcher/Dockerfile
@@ -14,4 +14,4 @@
ADD /scripts/build-commit-watcher.sh /scripts/
# Note that WATCHER_REV must be full for "git fetch origin $REV" later:
-RUN GO_REV=go1.4 TOOLS_REV=a54d0066172 WATCHER_REV=1b1e086fd18435e4ea46287fed6c85f268f47bf7 /scripts/build-commit-watcher.sh && test -f /usr/local/bin/watcher
+RUN GO_REV=go1.5 TOOLS_REV=1330b28 WATCHER_REV=629dcf77 /scripts/build-commit-watcher.sh && test -f /usr/local/bin/watcher
diff --git a/env/commit-watcher/scripts/build-commit-watcher.sh b/env/commit-watcher/scripts/build-commit-watcher.sh
index 70b5d6e..0b97037 100755
--- a/env/commit-watcher/scripts/build-commit-watcher.sh
+++ b/env/commit-watcher/scripts/build-commit-watcher.sh
@@ -7,6 +7,9 @@
: ${TOOLS_REV:?"need to be set to the tools repo revision used to build the commit watcher."}
: ${WATCHER_REV:?"need to be set to the build repo revision for the commit watcher."}
+curl https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -xz -C $HOME
+mv $HOME/go $HOME/go1.4
+
mkdir -p $GOROOT
git clone https://go.googlesource.com/go $GOROOT
(cd $GOROOT/src && git reset --hard $GO_REV && find && ./make.bash)
diff --git a/env/commit-watcher/scripts/install-apt-deps.sh b/env/commit-watcher/scripts/install-apt-deps.sh
index 02e6b07..79cc2cd 100755
--- a/env/commit-watcher/scripts/install-apt-deps.sh
+++ b/env/commit-watcher/scripts/install-apt-deps.sh
@@ -6,6 +6,8 @@
apt-get install -y --no-install-recommends gcc libc6-dev
# For interacting with the Go source & subrepos:
apt-get install -y --no-install-recommends git-core
+# For fetching go1.4
+apt-get install -y --no-install-recommends curl
apt-get clean
rm -fr /var/lib/apt/lists
