From 551edbff13f7ff6f240a4a082c02f9ada86f3e1a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 11 Dec 2014 21:50:58 -0800 Subject: [PATCH] dashboard: more environment cleanups sid was trying to use hg still. And remove curl everywhere (except nacl). It's unnecessary. Change-Id: I2a235d83b2bc7cf599c8de5796c724d8f368348e Reviewed-on: https://go-review.googlesource.com/1368 Reviewed-by: David Symonds --- dashboard/env/commit-watcher/scripts/install-apt-deps.sh | 3 +-- dashboard/env/linux-x86-base/scripts/install-apt-deps.sh | 3 +-- dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh | 3 +-- dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh | 2 +- dashboard/env/linux-x86-sid/scripts/build-go-builder.sh | 2 +- dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dashboard/env/commit-watcher/scripts/install-apt-deps.sh b/dashboard/env/commit-watcher/scripts/install-apt-deps.sh index 36e859c6..02e6b076 100755 --- a/dashboard/env/commit-watcher/scripts/install-apt-deps.sh +++ b/dashboard/env/commit-watcher/scripts/install-apt-deps.sh @@ -1,8 +1,7 @@ set -ex apt-get update -# For running curl to get the hg starter tarballs (faster than hg clone). -apt-get install -y --no-install-recommends curl ca-certificates +apt-get install -y --no-install-recommends ca-certificates # For building Go's bootstrap 'dist' prog apt-get install -y --no-install-recommends gcc libc6-dev # For interacting with the Go source & subrepos: diff --git a/dashboard/env/linux-x86-base/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-base/scripts/install-apt-deps.sh index c38324c6..913aada4 100755 --- a/dashboard/env/linux-x86-base/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-base/scripts/install-apt-deps.sh @@ -1,8 +1,7 @@ set -ex apt-get update -# For running curl to get the hg starter tarballs (faster than hg clone). -apt-get install -y --no-install-recommends curl ca-certificates +apt-get install -y --no-install-recommends ca-certificates # Optionally used by some net/http tests: apt-get install -y --no-install-recommends strace # For building Go's bootstrap 'dist' prog diff --git a/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh index 76e18734..4c14db0e 100755 --- a/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh @@ -1,8 +1,7 @@ set -ex apt-get update -# For running curl to get the hg starter tarballs (faster than hg clone). -apt-get install -y --no-install-recommends curl ca-certificates +apt-get install -y --no-install-recommends ca-certificates # Optionally used by some net/http tests: apt-get install -y --no-install-recommends strace # For building Go's bootstrap 'dist' prog diff --git a/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh index 08eeb8ef..0034fa63 100755 --- a/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh @@ -1,7 +1,7 @@ set -ex apt-get update -# For running curl to get the hg starter tarballs (faster than hg clone). +# curl is needed to fetch the sel_ldr nacl binaries: apt-get install -y --no-install-recommends curl ca-certificates # For building Go's bootstrap 'dist' prog apt-get install -y --no-install-recommends gcc libc6-dev diff --git a/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh b/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh index 9cc8285f..13b7d738 100755 --- a/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh @@ -15,7 +15,7 @@ mkdir -p $GO_TOOLS git clone https://go.googlesource.com/tools $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) +(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH diff --git a/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh index c38324c6..913aada4 100755 --- a/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh @@ -1,8 +1,7 @@ set -ex apt-get update -# For running curl to get the hg starter tarballs (faster than hg clone). -apt-get install -y --no-install-recommends curl ca-certificates +apt-get install -y --no-install-recommends ca-certificates # Optionally used by some net/http tests: apt-get install -y --no-install-recommends strace # For building Go's bootstrap 'dist' prog