From 94e3c965eb5f379282555aa1d41a84157a596a5a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 15 Jan 2015 10:49:14 -0800 Subject: [PATCH] dashboard: fixes from tree move, use 'extdep' build tag consistently extdep means the package has contains external dependencies and will be omitted from the regular x/tools build + tests. Change-Id: I48d9161665811f0a0dc988d6f0c25d9c14b9e4ab Reviewed-on: https://go-review.googlesource.com/2892 Reviewed-by: Brad Fitzpatrick --- dashboard/cmd/buildlet/Makefile | 14 +++++++------- dashboard/cmd/buildlet/buildlet.go | 4 ++-- dashboard/cmd/buildlet/stage0/Makefile | 2 +- dashboard/cmd/buildlet/stage0/stage0.go | 2 +- dashboard/cmd/coordinator/Makefile | 4 ++-- dashboard/cmd/coordinator/buildongce/create.go | 4 ++-- dashboard/cmd/coordinator/coordinator.go | 4 ++-- dashboard/cmd/upload/upload.go | 6 +----- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dashboard/cmd/buildlet/Makefile b/dashboard/cmd/buildlet/Makefile index b30ce59b..833a17cf 100644 --- a/dashboard/cmd/buildlet/Makefile +++ b/dashboard/cmd/buildlet/Makefile @@ -1,26 +1,26 @@ buildlet: buildlet.go - go build --tags=buildlet + go build --tags=extdep buildlet.linux-amd64: buildlet.go - GOOS=linux GOARCH=amd64 go build -o $@ --tags=buildlet + GOOS=linux GOARCH=amd64 go build -o $@ --tags=extdep cat $@ | (cd ../upload && go run upload.go --public go-builder-data/$@) buildlet.openbsd-amd64: buildlet.go - GOOS=openbsd GOARCH=amd64 go build -o $@ --tags=buildlet + GOOS=openbsd GOARCH=amd64 go build -o $@ --tags=extdep cat $@ | (cd ../upload && go run upload.go --public go-builder-data/$@) buildlet.plan9-386: buildlet.go - GOOS=plan9 GOARCH=386 go build -o $@ --tags=buildlet + GOOS=plan9 GOARCH=386 go build -o $@ --tags=extdep cat $@ | (cd ../upload && go run upload.go --public go-builder-data/$@) buildlet.windows-amd64: buildlet.go - GOOS=windows GOARCH=amd64 go build -o $@ --tags=buildlet + GOOS=windows GOARCH=amd64 go build -o $@ --tags=extdep cat $@ | (cd ../upload && go run upload.go --public go-builder-data/$@) buildlet.darwin-amd64: buildlet.go - GOOS=darwin GOARCH=amd64 go build -o $@ --tags=buildlet + GOOS=darwin GOARCH=amd64 go build -o $@ --tags=extdep cat $@ | (cd ../upload && go run upload.go --public go-builder-data/$@) buildlet.netbsd-amd64: buildlet.go - GOOS=netbsd GOARCH=amd64 go build -o $@ --tags=buildlet + GOOS=netbsd GOARCH=amd64 go build -o $@ --tags=extdep cat $@ | (cd ../upload && go run upload.go --public go-builder-data/$@) diff --git a/dashboard/cmd/buildlet/buildlet.go b/dashboard/cmd/buildlet/buildlet.go index ad65b952..29c60eeb 100644 --- a/dashboard/cmd/buildlet/buildlet.go +++ b/dashboard/cmd/buildlet/buildlet.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build buildlet +// +build extdep // The buildlet is an HTTP server that untars content to disk and runs // commands it has untarred, streaming their output back over HTTP. @@ -12,7 +12,7 @@ // provides no security of its own. It is assumed that any user uses // it with an appropriately-configured firewall between their VM // instances. -package main // import "golang.org/x/tools/dashboard/buildlet" +package main // import "golang.org/x/tools/dashboard/cmd/buildlet" import ( "archive/tar" diff --git a/dashboard/cmd/buildlet/stage0/Makefile b/dashboard/cmd/buildlet/stage0/Makefile index f9a3c19a..b69cacf8 100644 --- a/dashboard/cmd/buildlet/stage0/Makefile +++ b/dashboard/cmd/buildlet/stage0/Makefile @@ -1,3 +1,3 @@ buildlet-stage0.windows-amd64: stage0.go - GOOS=windows GOARCH=amd64 go build -o $@ --tags=stage0 + GOOS=windows GOARCH=amd64 go build -o $@ --tags=extdep cat $@ | (cd ../../upload && go run upload.go --public go-builder-data/$@) diff --git a/dashboard/cmd/buildlet/stage0/stage0.go b/dashboard/cmd/buildlet/stage0/stage0.go index 609c5c8e..f9c6e6c8 100644 --- a/dashboard/cmd/buildlet/stage0/stage0.go +++ b/dashboard/cmd/buildlet/stage0/stage0.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build stage0 +// +build extdep // The stage0 command looks up the buildlet's URL from the GCE metadata // service, downloads it, and runs it. It's used primarily by Windows, diff --git a/dashboard/cmd/coordinator/Makefile b/dashboard/cmd/coordinator/Makefile index 166086fe..d004fa81 100644 --- a/dashboard/cmd/coordinator/Makefile +++ b/dashboard/cmd/coordinator/Makefile @@ -1,5 +1,5 @@ -coordinator: main.go - GOOS=linux go build --tags=build_coordinator -o coordinator . +coordinator: coordinator.go + GOOS=linux go build --tags=extdep -o coordinator . # After "make upload", either reboot the machine, or ssh to it and: # sudo systemctl restart gobuild.service diff --git a/dashboard/cmd/coordinator/buildongce/create.go b/dashboard/cmd/coordinator/buildongce/create.go index 2148ebb8..a6755bd7 100644 --- a/dashboard/cmd/coordinator/buildongce/create.go +++ b/dashboard/cmd/coordinator/buildongce/create.go @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build ignore +// +build extdep -package main // import "golang.org/x/tools/dashboard/coordinator/buildongce" +package main // import "golang.org/x/tools/dashboard/cmd/coordinator/buildongce" import ( "bufio" diff --git a/dashboard/cmd/coordinator/coordinator.go b/dashboard/cmd/coordinator/coordinator.go index df3dc487..65151ab6 100644 --- a/dashboard/cmd/coordinator/coordinator.go +++ b/dashboard/cmd/coordinator/coordinator.go @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build build_coordinator +// +build extdep // The coordinator runs on GCE and coordinates builds in Docker containers. -package main // import "golang.org/x/tools/dashboard/coordinator" +package main // import "golang.org/x/tools/dashboard/cmd/coordinator" import ( "archive/tar" diff --git a/dashboard/cmd/upload/upload.go b/dashboard/cmd/upload/upload.go index 44f5a727..880b8795 100644 --- a/dashboard/cmd/upload/upload.go +++ b/dashboard/cmd/upload/upload.go @@ -2,11 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build upload - -// ^ this is so we don't break the build of x/tools/... build due -// to missing depenencies on the builders. We don't want full builds -// needing to pull in dependencies outside of the x/tools repo. +// +build extdep // The upload command writes a file to Google Cloud Storage. It's used // exclusively by the Makefiles in the Go project repos. Think of it