Skip to content

Commit

Permalink
dashboard: disable nacl builders for the dev.link branch
Browse files Browse the repository at this point in the history
Updates golang/go#30439

Change-Id: Ic2548709c4a55c2c8b29a4f074bcb3df8292a7c3
Reviewed-on: https://go-review.googlesource.com/c/build/+/200765
Run-TryBot: Brad Fitzpatrick <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Bryan C. Mills <[email protected]>
  • Loading branch information
bradfitz committed Oct 11, 2019
1 parent 85c334c commit 90670e1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
4 changes: 2 additions & 2 deletions dashboard/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@ func init() {
HostType: "host-nacl-kube",
buildsRepo: func(repo, branch, goBranch string) bool {
// nacl support is removed in Go 1.14.
return repo == "go" && !atLeastGo1(goBranch, 14)
return repo == "go" && !atLeastGo1(goBranch, 14) && !strings.HasPrefix(goBranch, "dev.")
},
MaxAtOnce: 2,
numTryTestHelpers: 3,
Expand All @@ -1625,7 +1625,7 @@ func init() {
HostType: "host-nacl-kube",
buildsRepo: func(repo, branch, goBranch string) bool {
// nacl support is removed in Go 1.14.
return repo == "go" && !atLeastGo1(goBranch, 14)
return repo == "go" && !atLeastGo1(goBranch, 14) && !strings.HasPrefix(goBranch, "dev.")
},
tryBot: explicitTrySet("go"),
MaxAtOnce: 2,
Expand Down
26 changes: 26 additions & 0 deletions dashboard/builders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,30 @@ func TestTrybots(t *testing.T) {
"windows-amd64-2016",
},
},
{
repo: "go",
branch: "dev.link",
want: []string{
"freebsd-amd64-12_0",
"js-wasm",
"linux-386",
"linux-amd64",
"linux-amd64-race",
"misc-compile-other",
"misc-compile-darwin",
"misc-compile-linuxarm",
"misc-compile-solaris",
"misc-compile-freebsd",
"misc-compile-mips",
"misc-compile-netbsd",
"misc-compile-openbsd",
"misc-compile-plan9",
"misc-compile-ppc",
"openbsd-amd64-64",
"windows-386-2008",
"windows-amd64-2016",
},
},
{
repo: "go",
branch: "release-branch.go1.12",
Expand Down Expand Up @@ -388,9 +412,11 @@ func TestBuilderConfig(t *testing.T) {
{b("android-386-emu", "go"), isBuilder},

{b("nacl-386", "go"), none},
{b("[email protected]", "go"), none},
{b("[email protected]", "go"), onlyPost},
{b("nacl-386", "net"), none},
{b("nacl-amd64p32", "go"), none},
{b("[email protected]", "go"), none},
{b("[email protected]", "go"), both},
{b("nacl-amd64p32", "net"), none},

Expand Down

0 comments on commit 90670e1

Please sign in to comment.