From 3ee677ac1c3288940ec6616ca33d4711497b1ec4 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Mon, 10 Nov 2014 11:49:19 +1100 Subject: [PATCH] go.tools/dashboard/env: use newer builder This version of the builder can handle the new golang.org/x/ paths. LGTM=bradfitz R=bradfitz CC=golang-codereviews https://golang.org/cl/174750043 --- dashboard/env/linux-x86-base/Dockerfile | 2 +- dashboard/env/linux-x86-base/Makefile | 2 +- dashboard/env/linux-x86-clang/Dockerfile | 4 ++-- dashboard/env/linux-x86-clang/Makefile | 4 ++-- dashboard/env/linux-x86-nacl/Dockerfile | 2 +- dashboard/env/linux-x86-nacl/Makefile | 2 +- dashboard/env/linux-x86-sid/Dockerfile | 2 +- dashboard/env/linux-x86-sid/Makefile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dashboard/env/linux-x86-base/Dockerfile b/dashboard/env/linux-x86-base/Dockerfile index 9151d890..7d9ed805 100644 --- a/dashboard/env/linux-x86-base/Dockerfile +++ b/dashboard/env/linux-x86-base/Dockerfile @@ -13,4 +13,4 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=073fc578434b BUILDER_REV=8845ca94a310 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=8c27884843c3 BUILDER_REV=75944e2e3a63 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder diff --git a/dashboard/env/linux-x86-base/Makefile b/dashboard/env/linux-x86-base/Makefile index 7b4685ea..d94baf6d 100644 --- a/dashboard/env/linux-x86-base/Makefile +++ b/dashboard/env/linux-x86-base/Makefile @@ -9,4 +9,4 @@ docker-linux.base.tar.gz: docker docker save gobuilders/linux-x86-base | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.base.tar.gz) check: docker - docker run gobuilders/linux-x86-base /usr/local/bin/builder -rev=073fc578434b -buildroot=/ -v -report=false linux-amd64-temp + docker run gobuilders/linux-x86-base /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-amd64-temp diff --git a/dashboard/env/linux-x86-clang/Dockerfile b/dashboard/env/linux-x86-clang/Dockerfile index 296cd53b..209375c3 100644 --- a/dashboard/env/linux-x86-clang/Dockerfile +++ b/dashboard/env/linux-x86-clang/Dockerfile @@ -15,6 +15,6 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=073fc578434b BUILDER_REV=8845ca94a310 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=8c27884843c3 BUILDER_REV=75944e2e3a63 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder -ENV CC /usr/bin/clang \ No newline at end of file +ENV CC /usr/bin/clang diff --git a/dashboard/env/linux-x86-clang/Makefile b/dashboard/env/linux-x86-clang/Makefile index 4a9ae8a5..5e1ed0ff 100644 --- a/dashboard/env/linux-x86-clang/Makefile +++ b/dashboard/env/linux-x86-clang/Makefile @@ -9,7 +9,7 @@ docker-linux.clang.tar.gz: docker docker save gobuilders/linux-x86-clang | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.clang.tar.gz) check: docker - docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=fa76e8393654 -buildroot=/ -v -report=false linux-amd64-temp + docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-amd64-temp check32: docker - docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=fa76e8393654 -buildroot=/ -v -report=false linux-386-temp + docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-386-temp diff --git a/dashboard/env/linux-x86-nacl/Dockerfile b/dashboard/env/linux-x86-nacl/Dockerfile index 58c67375..b40385d4 100644 --- a/dashboard/env/linux-x86-nacl/Dockerfile +++ b/dashboard/env/linux-x86-nacl/Dockerfile @@ -20,7 +20,7 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=073fc578434b BUILDER_REV=8845ca94a310 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=8c27884843c3 BUILDER_REV=75944e2e3a63 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder ADD build-command.pl /usr/local/bin/ diff --git a/dashboard/env/linux-x86-nacl/Makefile b/dashboard/env/linux-x86-nacl/Makefile index 34cb1eb9..3c2b7e3a 100644 --- a/dashboard/env/linux-x86-nacl/Makefile +++ b/dashboard/env/linux-x86-nacl/Makefile @@ -9,4 +9,4 @@ upload: docker docker save gobuilders/linux-x86-nacl | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.nacl.tar.gz) check: docker - docker run gobuilders/linux-x86-nacl /usr/local/bin/builder -rev=073fc578434b -buildroot=/ -v -cmd=/usr/local/bin/build-command.pl -report=false nacl-amd64p32-temp + docker run gobuilders/linux-x86-nacl /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -cmd=/usr/local/bin/build-command.pl -report=false nacl-amd64p32-temp diff --git a/dashboard/env/linux-x86-sid/Dockerfile b/dashboard/env/linux-x86-sid/Dockerfile index fdbf73d2..05a917c9 100644 --- a/dashboard/env/linux-x86-sid/Dockerfile +++ b/dashboard/env/linux-x86-sid/Dockerfile @@ -11,4 +11,4 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=073fc578434b BUILDER_REV=8845ca94a310 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=8c27884843c3 BUILDER_REV=75944e2e3a63 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder diff --git a/dashboard/env/linux-x86-sid/Makefile b/dashboard/env/linux-x86-sid/Makefile index a50b12c8..e636e493 100644 --- a/dashboard/env/linux-x86-sid/Makefile +++ b/dashboard/env/linux-x86-sid/Makefile @@ -9,4 +9,4 @@ docker-linux.sid.tar.gz: docker docker save gobuilders/linux-x86-sid | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.sid.tar.gz) check: docker - docker run gobuilders/linux-x86-sid /usr/local/bin/builder -rev=fa76e8393654 -buildroot=/ -v -report=false linux-amd64-sid + docker run gobuilders/linux-x86-sid /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-amd64-sid