dashboard: enable unified/nounified builders for dev.unified
There's now the dev.unified branch for handling Unified IR
development, so have the unified (and nounified) trybot and builders
testing that branch instead of dev.typeparams (which is inactive).
Change-Id: Ib6911ee68b4c570e34fe282bb7a27c571b70e3e0
Reviewed-on: https://go-review.googlesource.com/c/build/+/410634
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Auto-Submit: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 72bcec3..1a25de3 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1790,10 +1790,10 @@
Notes: "builder with GOEXPERIMENT=unified, see golang.org/issue/46786",
tryBot: func(repo, branch, goBranch string) bool {
// TODO(go.dev/issue/52150): Restore testing against tools repo.
- return (repo == "go" /*|| repo == "tools"*/) && (goBranch == "master" || goBranch == "dev.typeparams")
+ return (repo == "go" /*|| repo == "tools"*/) && (goBranch == "master" || goBranch == "dev.unified")
},
buildsRepo: func(repo, branch, goBranch string) bool {
- return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams")
+ return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.unified")
},
env: []string{
"GO_DISABLE_OUTBOUND_NETWORK=1",
@@ -1811,10 +1811,10 @@
HostType: "host-linux-buster",
Notes: "builder with GOEXPERIMENT=nounified, see golang.org/issue/51397",
tryBot: func(repo, branch, goBranch string) bool {
- return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams")
+ return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.unified")
},
buildsRepo: func(repo, branch, goBranch string) bool {
- return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.typeparams")
+ return (repo == "go" || repo == "tools") && (goBranch == "master" || goBranch == "dev.unified")
},
env: []string{
"GO_DISABLE_OUTBOUND_NETWORK=1",
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index b3eba3a..c404eba 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -127,43 +127,6 @@
},
{
repo: "go",
- branch: "dev.typeparams",
- want: []string{
- "android-amd64-emu",
- "freebsd-amd64-12_3",
- "js-wasm",
- "linux-386",
- "linux-amd64",
- "linux-amd64-boringcrypto", // GoDeps will exclude, but not in test
- "linux-amd64-race",
- "linux-amd64-unified",
- "linux-amd64-nounified",
- "linux-arm-aws",
- "linux-arm64-aws",
- "openbsd-amd64-68",
- "openbsd-amd64-70",
- "windows-386-2008",
- "windows-386-2012",
- "windows-amd64-2016",
-
- "misc-compile-darwin",
- "misc-compile-freebsd",
- "misc-compile-windows-arm",
- "misc-compile-mips",
- "misc-compile-mipsle",
- "misc-compile-netbsd",
- "misc-compile-netbsd-arm",
- "misc-compile-openbsd",
- "misc-compile-openbsd-arm",
- "misc-compile-plan9",
- "misc-compile-ppc",
- "misc-compile-solaris",
- "misc-compile-other-1",
- "misc-compile-other-2",
- },
- },
- {
- repo: "go",
branch: "release-branch.go1.17",
want: []string{
"android-amd64-emu",
@@ -677,16 +640,16 @@
{b("linux-amd64-unified", "go"), both},
{b("linux-amd64-unified", "tools"), onlyPost},
{b("linux-amd64-unified", "net"), none},
- {b("linux-amd64-unified@dev.typeparams", "go"), both},
- {b("linux-amd64-unified@dev.typeparams", "tools"), onlyPost},
- {b("linux-amd64-unified@dev.typeparams", "net"), none},
+ {b("linux-amd64-unified@dev.unified", "go"), both},
+ {b("linux-amd64-unified@dev.unified", "tools"), onlyPost},
+ {b("linux-amd64-unified@dev.unified", "net"), none},
{b("linux-amd64-nounified", "go"), both},
{b("linux-amd64-nounified", "tools"), both},
{b("linux-amd64-nounified", "net"), none},
- {b("linux-amd64-nounified@dev.typeparams", "go"), both},
- {b("linux-amd64-nounified@dev.typeparams", "tools"), both},
- {b("linux-amd64-nounified@dev.typeparams", "net"), none},
+ {b("linux-amd64-nounified@dev.unified", "go"), both},
+ {b("linux-amd64-nounified@dev.unified", "tools"), both},
+ {b("linux-amd64-nounified@dev.unified", "net"), none},
}
for _, tt := range tests {
t.Run(tt.br.testName, func(t *testing.T) {
