dashboard: don't test the main branch on macOS 10.15

CL 558197 updated LUCI builders to take into account that Go 1.23 will require macOS 11 Big Sur or later. We haven't fully migrated away from the old dashboard, so apply the same change here for now. For golang/go#64207. Change-Id: If0baa35d6f595d33911eaef43a467ad71c0a4c15 Reviewed-on: https://go-review.googlesource.com/c/build/+/564215 Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Than McIntosh <[email protected]>
golang · Feb 15, 2024 · da22f7c · da22f7c
1 parent eec8b23
commit da22f7c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -2369,7 +2369,9 @@ func init() {
 		Name:           "darwin-amd64-10_15",
 		HostType:       "host-darwin-amd64-10_15-aws",
 		distTestAdjust: macTestPolicy,
-		buildsRepo:     defaultPlusExpBuild,
+		buildsRepo: func(repo, branch, goBranch string) bool {
+			return defaultPlusExpBuild(repo, branch, goBranch) && atMostGo1(goBranch, 22)
+		},
 	})
 	addBuilder(BuildConfig{
 		Name:           "darwin-amd64-11_0",

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
@@ -704,8 +704,8 @@ func TestBuilderConfig(t *testing.T) {
 		{b("linux-amd64-longtest", "exp"), onlyPost},
 		{b("windows-386-2008", "exp"), none},
 		{b("windows-amd64-2016", "exp"), both},
-		{b("darwin-amd64-10_14", "exp"), none},
-		{b("darwin-amd64-10_15", "exp"), onlyPost},
+		{b("darwin-amd64-10_15", "exp"), none},
+		{b("darwin-amd64-11_0", "exp"), onlyPost},
 		// ... but not on most others:
 		{b("freebsd-386-12_3", "exp"), none},
 		{b("freebsd-amd64-12_3", "exp"), none},
@@ -724,8 +724,8 @@ func TestBuilderConfig(t *testing.T) {
 		{b("linux-amd64", "build"), both},
 		{b("linux-amd64-longtest", "build"), onlyPost},
 		{b("windows-amd64-2016", "build"), both},
-		{b("darwin-amd64-10_14", "build"), none},
-		{b("darwin-amd64-10_15", "build"), onlyPost},
+		{b("darwin-amd64-10_15", "build"), none},
+		{b("darwin-amd64-11_0", "build"), onlyPost},
 		{b("linux-amd64-fedora", "build"), none},
 		{b("linux-amd64-clang", "build"), none},
 		{b("linux-amd64-sid", "build"), none},
@@ -747,15 +747,14 @@ func TestBuilderConfig(t *testing.T) {
 		{b("android-386-emu", "build"), none},
 		{b("android-amd64-emu", "build"), none},
 
-		{b("darwin-amd64-10_15", "go"), onlyPost},
-
-		// Go 1.20 is the last release with macOS 10.14 support:
-		{b("darwin-amd64-10_14", "go"), none},
-		{b("[email protected]", "go"), none},
-		{b("[email protected]", "go"), onlyPost},
-		{b("darwin-amd64-10_14", "net"), none},
-		{b("[email protected]", "net"), none},
-		{b("[email protected]", "net"), onlyPost},
+		{b("darwin-amd64-11_0", "go"), onlyPost},
+		// Go 1.22 is the last release with macOS 10.15 support:
+		{b("darwin-amd64-10_15", "go"), none},
+		{b("[email protected]", "go"), none},
+		{b("[email protected]", "go"), onlyPost},
+		{b("darwin-amd64-10_15", "net"), none},
+		{b("[email protected]", "net"), none},
+		{b("[email protected]", "net"), onlyPost},
 
 		// The darwin longtest builder added during the Go 1.21 dev cycle:
 		{b("[email protected]", "go"), onlyPost},