Skip to content

Commit 6469a76

Browse files
committed
dashboard: limit macOS 10.12 builders to at most go1.16
macOS will not be supported after go1.16. This change limits the macOS 10.12 builders to build previous to go1.17. Updates golang/go#44303 For golang/go#23011 Change-Id: Ib6b4e7939ffb9032b255574d3f0b4fffaad97803 Reviewed-on: https://go-review.googlesource.com/c/build/+/312692 Trust: Carlos Amedee <[email protected]> Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 8050efc commit 6469a76

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

dashboard/builders.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,6 +2302,10 @@ func init() {
23022302
Name: "darwin-amd64-10_12",
23032303
HostType: "host-darwin-10_12",
23042304
distTestAdjust: macTestPolicy,
2305+
buildsRepo: func(repo, branch, goBranch string) bool {
2306+
// macOS 10.12 not supported after Go 1.16
2307+
return atMostGo1(goBranch, 16) && buildRepoByDefault(repo)
2308+
},
23052309
})
23062310
addBuilder(BuildConfig{
23072311
Name: "darwin-amd64-10_14",

dashboard/builders_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,11 +547,14 @@ func TestBuilderConfig(t *testing.T) {
547547
{b("android-amd64-emu", "build"), none},
548548

549549
// Only use latest macOS for subrepos, and only amd64:
550-
{b("darwin-amd64-10_12", "net"), onlyPost},
550+
{b("[email protected]", "net"), onlyPost},
551+
{b("darwin-amd64-10_12", "net"), none},
552+
{b("darwin-amd64-10_14", "net"), onlyPost},
551553

552554
{b("darwin-amd64-10_15", "go"), onlyPost},
553555
{b("darwin-amd64-10_14", "go"), onlyPost},
554-
{b("darwin-amd64-10_12", "go"), onlyPost},
556+
{b("darwin-amd64-10_12", "go"), none},
557+
{b("[email protected]", "go"), onlyPost},
555558

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

0 commit comments

Comments
 (0)