cmd/release: use macOS 11.0 to build go1.17 and up
We continue to use 10.15 for 1.16 and 1.15.
Fixes golang/go#46161.
Change-Id: I84b597c6cf99f1d212ff1bba271bec8ef1c0557c
Reviewed-on: https://go-review.googlesource.com/c/build/+/321011
Trust: Heschi Kreinick <heschi@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Heschi Kreinick <heschi@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/cmd/release/release.go b/cmd/release/release.go
index 7aee727..fd74174 100644
--- a/cmd/release/release.go
+++ b/cmd/release/release.go
@@ -202,10 +202,11 @@
Builder: "windows-amd64-2008",
},
{
+ GoQuery: ">= go1.17beta1",
OS: "darwin",
Arch: "amd64",
Race: true,
- Builder: "darwin-amd64-10_15",
+ Builder: "darwin-amd64-11_0",
},
{
GoQuery: ">= go1.16beta1", // Go 1.16 Beta 1 is the first Go (pre-)release with the darwin/arm64 port.
@@ -274,6 +275,13 @@
Race: true,
Builder: "freebsd-amd64-11_2",
},
+ {
+ GoQuery: "< go1.17beta1", // See golang/go#46161.
+ OS: "darwin",
+ Arch: "amd64",
+ Race: true,
+ Builder: "darwin-amd64-10_15",
+ },
// Test-only builds.
{
diff --git a/cmd/release/release_test.go b/cmd/release/release_test.go
index 3c9e43f..bd982c1 100644
--- a/cmd/release/release_test.go
+++ b/cmd/release/release_test.go
@@ -104,10 +104,14 @@
// Go 1.16 continues to use the the FreeBSD 11.2 builder.
{"go1.16", "freebsd-amd64", "freebsd-amd64-11_2"},
{"go1.16", "freebsd-386", "freebsd-386-11_2"},
+ // Go 1.16 uses MacOS 10.15.
+ {"go1.16", "darwin-amd64", "darwin-amd64-10_15"},
// Go 1.17 starts to use the FreeBSD 11.4 builder.
{"go1.17", "freebsd-amd64", "freebsd-amd64-11_4"},
{"go1.17", "freebsd-386", "freebsd-386-11_4"},
+ // Go 1.17 uses MacOS 11.0.
+ {"go1.17", "darwin-amd64", "darwin-amd64-11_0"},
}
for _, tc := range testCases {
t.Run(tc.target+"@"+tc.goVer, func(t *testing.T) {
