Skip to content

Commit df6c66f

Browse files
committed
dashboard: only run linux-386-387 builder on Go 1.15 and older
Also update some test cases to be more relevant. For golang/go#40255. Fixes golang/go#41799. Change-Id: Ie63e068a46058bcaf7866f2090049fb888612cbe Reviewed-on: https://go-review.googlesource.com/c/build/+/259449 Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> Trust: Dmitri Shuralyov <[email protected]>
1 parent 18919d6 commit df6c66f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

dashboard/builders.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,9 @@ func init() {
14891489
Name: "linux-386-387",
14901490
Notes: "GO386=387",
14911491
buildsRepo: func(repo, branch, goBranch string) bool {
1492-
return repo == "go" || (repo == "crypto" && branch == "master" && goBranch == "master")
1492+
// GO386=387 is removed in Go 1.16 (golang.org/issue/40255).
1493+
// It's still supported in Go 1.15 and 1.14.
1494+
return atMostGo1(goBranch, 15) && (repo == "go" || repo == "crypto")
14931495
},
14941496
HostType: "host-linux-jessie",
14951497
env: []string{"GOARCH=386", "GOHOSTARCH=386", "GO386=387"},

dashboard/builders_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,14 @@ func TestBuilderConfig(t *testing.T) {
307307

308308
// Don't test all subrepos on all the builders.
309309
{b("linux-amd64-ssacheck", "net"), none},
310-
{b("[email protected]", "net"), none},
311-
{b("linux-386-387", "crypto"), onlyPost},
312-
{b("[email protected]", "net"), none},
310+
{b("[email protected]", "net"), none},
311+
{b("linux-386-387", "crypto"), none},
312+
{b("[email protected]", "crypto"), none},
313+
{b("[email protected]", "crypto"), onlyPost},
314+
315+
{b("[email protected]", "build"), none},
316+
{b("[email protected]", "crypto"), onlyPost},
317+
{b("[email protected]", "net"), none},
313318
{b("linux-arm-arm5spacemonkey", "exp"), none},
314319
{b("linux-arm-arm5spacemonkey", "mobile"), none},
315320

0 commit comments

Comments
 (0)