Skip to content

Commit 3441580

Browse files
zx2c4cagedmantis
authored andcommitted
dashboard: do not sunset windows 2008
CL 363474 added a 2012 builder, which is good, but it also took a major step in sunsetting Windows 7 support by removing all 2008 builders from trybots and for Go 1.18+. This will surely bitrot Windows 7 support and force us to remove support for it, which isn't okay. Rather than line up dominoes to force our hand on policy, such huge policy changes with sweeping ramifications should be properly decided. So, this commit keeps the 2008 builders in the running, alongside the 2012 ones. Updates golang/go#47845. Updates golang/go#49490. Change-Id: I574f51ea22f638d2f9b09fcd00fdfc3097631771 Reviewed-on: https://go-review.googlesource.com/c/build/+/366656 Trust: Jason A. Donenfeld <Jason@zx2c4.com> Trust: Carlos Amedee <carlos@golang.org> Run-TryBot: Jason A. Donenfeld <Jason@zx2c4.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Carlos Amedee <carlos@golang.org>
1 parent 67fc292 commit 3441580

File tree

2 files changed

+24
-30
lines changed

2 files changed

+24
-30
lines changed

dashboard/builders.go

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ var slowBotAliases = map[string]string{
9595
"solaris-amd64": "solaris-amd64-oraclerel",
9696
"wasm": "js-wasm",
9797
"windows": "windows-amd64-2016",
98-
"windows-386": "windows-386-2012",
98+
"windows-386": "windows-386-2008",
9999
"windows-amd64": "windows-amd64-2016",
100100
"windows-arm": "windows-arm-zx2c4",
101101
"windows-arm64": "windows-arm64-10",
@@ -1262,7 +1262,7 @@ func (c *BuildConfig) buildsRepoAtAll(repo, branch, goBranch string) bool {
12621262

12631263
// Build dev.boringcrypto branches only on linux/amd64 and windows/386 (see golang.org/issue/26791).
12641264
if repo == "go" && (branch == "dev.boringcrypto" || strings.HasPrefix(branch, "dev.boringcrypto.")) {
1265-
if c.Name != "linux-amd64" && c.Name != "windows-386-2012" {
1265+
if c.Name != "linux-amd64" && c.Name != "windows-386-2012" && c.Name != "windows-386-2008" {
12661266
return false
12671267
}
12681268
}
@@ -2186,6 +2186,7 @@ func init() {
21862186
Name: "windows-amd64-2008",
21872187
HostType: "host-windows-amd64-2008",
21882188
distTestAdjust: noTestDirAndNoReboot,
2189+
buildsRepo: onlyGo,
21892190
env: []string{
21902191
"GOARCH=amd64",
21912192
"GOHOSTARCH=amd64",
@@ -2195,33 +2196,23 @@ func init() {
21952196
// up:
21962197
"GO_TEST_TIMEOUT_SCALE=2",
21972198
},
2198-
buildsRepo: func(repo, branch, goBranch string) bool {
2199-
// This builder bill be used up to Go 1.17.
2200-
return atMostGo1(goBranch, 17) && onlyGo(repo, branch, goBranch)
2201-
},
22022199
})
22032200
addBuilder(BuildConfig{
2204-
Name: "windows-386-2008",
2205-
HostType: "host-windows-amd64-2008",
2206-
distTestAdjust: fasterTrybots,
2207-
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
2208-
tryBot: defaultTrySet(),
2209-
buildsRepo: func(repo, branch, goBranch string) bool {
2210-
// This builder bill be used up to Go 1.17.
2211-
return atMostGo1(goBranch, 17) && defaultPlusExpBuild(repo, branch, goBranch)
2212-
},
2201+
Name: "windows-386-2008",
2202+
HostType: "host-windows-amd64-2008",
2203+
buildsRepo: defaultPlusExpBuild,
2204+
distTestAdjust: fasterTrybots,
2205+
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
2206+
tryBot: defaultTrySet(),
22132207
numTryTestHelpers: 4,
22142208
})
22152209
addBuilder(BuildConfig{
2216-
Name: "windows-386-2012",
2217-
HostType: "host-windows-amd64-2012",
2218-
distTestAdjust: fasterTrybots,
2219-
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
2220-
tryBot: defaultTrySet(),
2221-
buildsRepo: func(repo, branch, goBranch string) bool {
2222-
// This builder is used by Go 1.18 and forward.
2223-
return atLeastGo1(goBranch, 18) && defaultPlusExpBuild(repo, branch, goBranch)
2224-
},
2210+
Name: "windows-386-2012",
2211+
HostType: "host-windows-amd64-2012",
2212+
distTestAdjust: fasterTrybots,
2213+
buildsRepo: onlyGo,
2214+
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
2215+
tryBot: defaultTrySet(),
22252216
numTryTestHelpers: 4,
22262217
})
22272218
addBuilder(BuildConfig{

dashboard/builders_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ func TestTrybots(t *testing.T) {
103103
"openbsd-amd64-68",
104104
"openbsd-amd64-70",
105105
"openbsd-amd64-70-n1",
106+
"windows-386-2008",
106107
"windows-386-2012",
107108
"windows-amd64-2016",
108109

@@ -137,6 +138,7 @@ func TestTrybots(t *testing.T) {
137138
"openbsd-amd64-68",
138139
"openbsd-amd64-70",
139140
"openbsd-amd64-70-n1",
141+
"windows-386-2008",
140142
"windows-386-2012",
141143
"windows-amd64-2016",
142144

@@ -169,6 +171,7 @@ func TestTrybots(t *testing.T) {
169171
"linux-arm64-aws",
170172
"openbsd-amd64-68",
171173
"windows-386-2008",
174+
"windows-386-2012",
172175
"windows-amd64-2016",
173176

174177
"misc-compile-darwinarm64", // Starts with Go 1.16.
@@ -205,6 +208,7 @@ func TestTrybots(t *testing.T) {
205208
"linux-arm64-aws",
206209
"openbsd-amd64-68",
207210
"windows-386-2008",
211+
"windows-386-2012",
208212
"windows-amd64-2016",
209213

210214
"misc-compile-freebsd",
@@ -257,7 +261,7 @@ func TestTrybots(t *testing.T) {
257261
"openbsd-amd64-68",
258262
"openbsd-amd64-70",
259263
"openbsd-amd64-70-n1",
260-
"windows-386-2012",
264+
"windows-386-2008",
261265
"windows-amd64-2016",
262266
},
263267
},
@@ -267,7 +271,7 @@ func TestTrybots(t *testing.T) {
267271
want: []string{
268272
"linux-amd64",
269273
"linux-amd64-race",
270-
"windows-386-2012",
274+
"windows-386-2008",
271275
"windows-amd64-2016",
272276
},
273277
},
@@ -289,12 +293,12 @@ func TestTrybots(t *testing.T) {
289293
}
290294
for _, b := range got {
291295
if _, ok := m[b]; !ok {
292-
t.Errorf("got unexpected %q", b)
296+
t.Errorf("got unexpected %q for %s/%s", b, tt.repo, tt.branch)
293297
}
294298
delete(m, b)
295299
}
296300
for b := range m {
297-
t.Errorf("missing expected %q", b)
301+
t.Errorf("missing expected %q for %s/%s", b, tt.repo, tt.branch)
298302
}
299303
})
300304
}
@@ -547,8 +551,7 @@ func TestBuilderConfig(t *testing.T) {
547551
{b("linux-amd64", "exp"), both},
548552
{b("linux-amd64-race", "exp"), both},
549553
{b("linux-amd64-longtest", "exp"), onlyPost},
550-
{b("windows-386-2008", "exp"), none},
551-
{b("windows-386-2012", "exp"), both},
554+
{b("windows-386-2008", "exp"), both},
552555
{b("windows-amd64-2016", "exp"), both},
553556
{b("darwin-amd64-10_14", "exp"), onlyPost},
554557
{b("darwin-amd64-10_15", "exp"), onlyPost},

0 commit comments

Comments
 (0)