Skip to content

Commit 0e423fd

Browse files
committed
dashboard: disable darwin/386 builder on master
The 32-bit pairs darwin/386 and darwin/arm are removed in Go 1.15, and the master branch is where Go 1.15 is being developed. The builder has started to fail after CL 226985 (as intended), so remove it. Keep it running on Go 1.14 and 1.13 release branches. Also update the misc-compile-darwin builder description. For golang/go#37610. For golang/go#37611. Change-Id: Ia70386c5ae2821b4397048dcb0862a066463d6de Reviewed-on: https://go-review.googlesource.com/c/build/+/227181 Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Andrew Bonventre <andybons@golang.org>
1 parent a39e467 commit 0e423fd

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

dashboard/builders.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var slowBotAliases = map[string]string{
4444
"arm64": "linux-arm64-packet",
4545
"arm64p32": "nacl-amd64p32",
4646
"darwin": "darwin-amd64-10_14",
47-
"darwin-386": "darwin-386-10_14",
47+
"darwin-386": "darwin-386-10_14", // TODO(golang.org/issue/37610): Remove when Go 1.14 is no longer supported.
4848
"darwin-amd64": "darwin-amd64-10_14",
4949
"darwin-arm64": "darwin-arm64-corellium",
5050
"dragonfly": "dragonfly-amd64",
@@ -1533,7 +1533,7 @@ func init() {
15331533
})
15341534
}
15351535
addMiscCompile("-linuxarm", "^linux-arm") // 2: arm, arm64
1536-
addMiscCompile("-darwin", "^darwin") // 4: 386, amd64 + iOS: arm, arm64
1536+
addMiscCompile("-darwin", "^darwin") // 2: amd64, arm64 (for Go 1.14 and older, 4: 386, amd64 + iOS: arm, arm64)
15371537
addMiscCompile("-mips", "^linux-mips") // 4: mips, mipsle, mips64, mips64le
15381538
addMiscCompile("-ppc", "^(linux-ppc64|aix-)") // 3: linux-ppc64{,le}, aix-ppc64
15391539
addMiscCompile("-solaris", "^(solaris|illumos)") // 2: both amd64
@@ -2059,7 +2059,9 @@ func init() {
20592059
HostType: "host-darwin-10_14",
20602060
shouldRunDistTest: macTestPolicy,
20612061
buildsRepo: func(repo, branch, goBranch string) bool {
2062-
return repo == "go" && atLeastGo1(branch, 13)
2062+
// Go 1.14 is the last release that will support 32-bit binaries on macOS (darwin/386).
2063+
// (See https://golang.org/doc/go1.14#darwin.)
2064+
return repo == "go" && atMostGo1(branch, 14)
20632065
},
20642066
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
20652067
})

dashboard/builders_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,10 @@ func TestBuilderConfig(t *testing.T) {
527527
{b("darwin-amd64-10_11", "go"), none},
528528
{b("darwin-amd64-10_11@go1.14", "go"), onlyPost}, // Go 1.14 is the last release that will run on macOS 10.11 El Capitan.
529529
{b("darwin-amd64-10_11@go1.15", "go"), none}, // Go 1.15 will require macOS 10.12 Sierra or later.
530-
{b("darwin-386-10_14", "go"), onlyPost},
531-
{b("darwin-386-10_14@go1.12", "go"), none},
530+
{b("darwin-386-10_14", "go"), none},
532531
{b("darwin-386-10_14@go1.13", "go"), onlyPost},
532+
{b("darwin-386-10_14@go1.14", "go"), onlyPost}, // Go 1.14 is the last release that supports 32-bit on macOS.
533+
{b("darwin-386-10_14@go1.15", "go"), none},
533534

534535
// plan9 only lived at master. We didn't support any past releases.
535536
// But it's off for now as it's always failing.

0 commit comments

Comments
 (0)