From b3adf7ce01db4965fb74fa6bb543b849b7062b6a Mon Sep 17 00:00:00 2001 From: Alexander Rakoczy Date: Mon, 26 Aug 2019 16:40:35 -0400 Subject: [PATCH] dashboard: require at least Go 1.13 for darwin-386 builder release-branch.go1.12 has failures for darwin-386-10_14, which are fixed in Go 1.13. darwin-386 is not a first-class port and on a deprecated architecture for macOS, and can be skipped on older branches. Fixes golang/go#33756 Change-Id: I5f2e95fe9515978a85b986787d8126655f849629 Reviewed-on: https://go-review.googlesource.com/c/build/+/191878 Run-TryBot: Alexander Rakoczy TryBot-Result: Gobot Gobot Reviewed-by: Dmitri Shuralyov Reviewed-by: Brad Fitzpatrick --- dashboard/builders.go | 8 +++++--- dashboard/builders_test.go | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index 8016036774..3050c179aa 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -1914,9 +1914,11 @@ func init() { Name: "darwin-386-10_14", HostType: "host-darwin-10_14", shouldRunDistTest: macTestPolicy, - buildsRepo: onlyGo, - MaxAtOnce: 1, - env: []string{"GOARCH=386", "GOHOSTARCH=386"}, + buildsRepo: func(repo, branch, goBranch string) bool { + return repo == "go" && atLeastGo1(branch, 13) + }, + MaxAtOnce: 1, + env: []string{"GOARCH=386", "GOHOSTARCH=386"}, }) addBuilder(BuildConfig{ Name: "darwin-amd64-10_12", diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go index 5f42f9287c..e525b6947d 100644 --- a/dashboard/builders_test.go +++ b/dashboard/builders_test.go @@ -467,8 +467,8 @@ func TestBuilderConfig(t *testing.T) { {b("darwin-amd64-10_10@go1.12", "go"), onlyPost}, {b("darwin-amd64-10_10@go1.11", "go"), onlyPost}, {b("darwin-386-10_14", "go"), onlyPost}, - {b("darwin-386-10_14@go1.12", "go"), onlyPost}, - {b("darwin-386-10_14@go1.11", "go"), onlyPost}, + {b("darwin-386-10_14@go1.12", "go"), none}, + {b("darwin-386-10_14@go1.13", "go"), onlyPost}, // plan9 only lived at master. We didn't support any past releases. // But it's off for now as it's always failing.