cmd/release: revert to macOS 11 builder for 1.17, 1.16 minor releases
CL 365736 updated the builder to macOS 12 out of necessity, since
the macOS 11 builder was not available then. Based on discussion
since, the builder is back though in limited capacity. Continue
to use it for Go 1.17 and 1.16 minor releases, with the plan to
start using macOS 12 builder for Go 1.18 and onwards.
Fixes golang/go#49889.
Updates golang/go#40561.
Change-Id: Ie9b6341b7c1f378e26e2226fc2bb4c3cb7042f9b
Reviewed-on: https://go-review.googlesource.com/c/build/+/368394
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
diff --git a/cmd/release/release.go b/cmd/release/release.go
index eca253b..948edee 100644
--- a/cmd/release/release.go
+++ b/cmd/release/release.go
@@ -225,6 +225,7 @@
Builder: "darwin-amd64-11_0",
},
{
+ GoQuery: ">= go1.18beta1", // Go 1.18 Beta 1 is still to be finalized as part of issue 40561, but macOS 12 for now.
OS: "darwin",
Arch: "arm64",
Race: true,
@@ -268,6 +269,13 @@
Race: true,
Builder: "darwin-amd64-10_15",
},
+ {
+ GoQuery: "< go1.18beta1", // Go 1.17 and 1.16 still use macOS 11. See issue 49889.
+ OS: "darwin",
+ Arch: "arm64",
+ Race: true,
+ Builder: "darwin-arm64-11_0-toothrot",
+ },
// Test-only builds.
{
