dashboard: limit windows-{386,amd64}-2008 to build at most Go 1.20

For golang/go#58008. Change-Id: I4736d99b0e8b88d8bc550e80bfad86992dc669b8 Reviewed-on: https://go-review.googlesource.com/c/build/+/463578 Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Heschi Kreinick <heschi@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
golang · Jan 25, 2023 · 2f47dd9 · 2f47dd9
1 parent 68b5680
commit 2f47dd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -2078,8 +2078,9 @@ func init() {
 			// of Go, hence the atLeastGo1 call below; versions of Go
 			// prior to 1.20 will use the *-oldcc variant instead. See
 			// issue 35006 for more details.
+			// Go 1.20 is also the last version with Windows 7 support. See proposal 57003.
 			return onlyGo(repo, branch, goBranch) &&
-				atLeastGo1(goBranch, 20)
+				atLeastGo1(goBranch, 20) && atMostGo1(goBranch, 20)
 		},
 		env: []string{
 			"GOARCH=amd64",
@@ -2123,8 +2124,9 @@ func init() {
 			// of Go, hence the atLeastGo1 call below; versions of Go
 			// prior to 1.20 will use the *-oldcc variant instead. See
 			// issue 35006 for more details.
+			// Go 1.20 is also the last version with Windows 7 support. See proposal 57003.
 			return defaultPlusExpBuild(repo, branch, goBranch) &&
-				atLeastGo1(goBranch, 20)
+				atLeastGo1(goBranch, 20) && atMostGo1(goBranch, 20)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 		tryBot: func(repo, branch, goBranch string) bool {

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
@@ -102,7 +102,6 @@ func TestTrybots(t *testing.T) {
 				"linux-arm-aws",
 				"linux-arm64",
 				"openbsd-amd64-72",
-				"windows-386-2008",
 				"windows-386-2012",
 				"windows-amd64-2016",
 
@@ -225,7 +224,6 @@ func TestTrybots(t *testing.T) {
 				"netbsd-amd64-9_3",
 				"openbsd-386-72",
 				"openbsd-amd64-72",
-				"windows-386-2008",
 				"windows-amd64-2016",
 			},
 		},
@@ -235,7 +233,6 @@ func TestTrybots(t *testing.T) {
 			want: []string{
 				"linux-amd64",
 				"linux-amd64-race",
-				"windows-386-2008",
 				"windows-amd64-2016",
 			},
 		},
@@ -511,7 +508,7 @@ func TestBuilderConfig(t *testing.T) {
 		{b("linux-amd64", "exp"), both},
 		{b("linux-amd64-race", "exp"), both},
 		{b("linux-amd64-longtest", "exp"), onlyPost},
-		{b("windows-386-2008", "exp"), both},
+		{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},