dashboard: enable linux-amd64-unified on master
dev.typeparams has been merged to master, so continue testing that
GOEXPERIMENT=unified works there too.
Updates golang/go#46786.
Change-Id: Iea048ef081f4c40a5b1c516a7c0d68178fd0b196
Reviewed-on: https://go-review.googlesource.com/c/build/+/341931
Trust: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 0a78c9a..004f78a 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1732,10 +1732,10 @@
HostType: "host-linux-buster",
Notes: "builder with GOEXPERIMENT=unified, see golang.org/issue/46786",
tryBot: func(repo, branch, goBranch string) bool {
- return (repo == "go" || repo == "tools") && goBranch == "dev.typeparams"
+ return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams")
},
buildsRepo: func(repo, branch, goBranch string) bool {
- return (repo == "go" || repo == "tools") && goBranch == "dev.typeparams"
+ return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams")
},
env: []string{
"GO_DISABLE_OUTBOUND_NETWORK=1",
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index d6c85f6..9cf52e4 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -97,6 +97,7 @@
"linux-386",
"linux-amd64",
"linux-amd64-race",
+ "linux-amd64-unified",
"linux-arm-aws",
"linux-arm64-aws",
"openbsd-amd64-68",
@@ -615,8 +616,8 @@
{b("linux-amd64-staticlockranking@go1.14", "go"), none},
{b("linux-amd64-staticlockranking", "net"), none},
- {b("linux-amd64-unified", "go"), none},
- {b("linux-amd64-unified", "tools"), none},
+ {b("linux-amd64-unified", "go"), both},
+ {b("linux-amd64-unified", "tools"), both},
{b("linux-amd64-unified", "net"), none},
{b("linux-amd64-unified@dev.typeparams", "go"), both},
{b("linux-amd64-unified@dev.typeparams", "tools"), both},
