internal/releasetargets: drop 1.21 targets, add 1.24 targets

The Go 1.21 entries are no longer needed now that go1.23.0 is out. The list for tip is the same as for Go 1.23, except that the windows/arm port is not included because it's currently marked broken (CL 601777). I considered renaming allReleases to something more appropriate since it tracks only first class ports now, but leaving that to a future CL. For golang/go#40561. For golang/go#68552. Change-Id: Ic61e797a125aef5b9cc2782b87ea558e7c88035c Reviewed-on: https://go-review.googlesource.com/c/build/+/612555 LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Tim King <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
golang · Sep 11, 2024 · 3aa0793 · 3aa0793
1 parent 6dd253a
commit 3aa0793
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/internal/releasetargets/allports/go1.21.txt → internal/releasetargets/allports/go1.24.txt b/internal/releasetargets/allports/go1.21.txt → internal/releasetargets/allports/go1.24.txt
@@ -36,12 +36,13 @@ openbsd/386
 openbsd/amd64
 openbsd/arm
 openbsd/arm64
+openbsd/ppc64
+openbsd/riscv64
 plan9/386
 plan9/amd64
 plan9/arm
 solaris/amd64
 wasip1/wasm
 windows/386
 windows/amd64
-windows/arm
 windows/arm64
diff --git a/internal/releasetargets/genlatestports.bash b/internal/releasetargets/genlatestports.bash
@@ -2,6 +2,5 @@
 
 go install golang.org/dl/gotip@latest
 gotip download
-MAJOR=$(gotip version | grep -Eo 'go1\.[0-9]+')
+MAJOR=$(gotip env GOVERSION | grep -Eo 'go1\.[0-9]+')
 gotip tool dist list > allports/${MAJOR}.txt
-
diff --git a/internal/releasetargets/releases.txt b/internal/releasetargets/releases.txt
@@ -1,4 +1,4 @@
-Targets for release 1.21
+Targets for release 1.22
 ================================================================================
 aix-ppc64       aix        ppc64      (cross-compiled via distpack)
 
@@ -69,6 +69,8 @@ openbsd-arm     openbsd    arm        (cross-compiled via distpack)
 
 openbsd-arm64   openbsd    arm64      (cross-compiled via distpack)
 
+openbsd-ppc64   openbsd    ppc64      (cross-compiled via distpack)
+
 plan9-386       plan9      386        (cross-compiled via distpack)
 
 plan9-amd64     plan9      amd64      (cross-compiled via distpack)
@@ -89,12 +91,12 @@ windows-arm64   windows    arm64      (cross-compiled via distpack)
 
 
 
-Targets for release 1.22
+Targets for release 1.23
 ================================================================================
 aix-ppc64       aix        ppc64      (cross-compiled via distpack)
 
 darwin-amd64    darwin     amd64      (cross-compiled via distpack)
-	First class port, Minimum macOS version is 10.15
+	First class port, Minimum macOS version is 11
 
 darwin-arm64    darwin     arm64      (cross-compiled via distpack)
 	First class port, Minimum macOS version is 11
@@ -162,6 +164,8 @@ openbsd-arm64   openbsd    arm64      (cross-compiled via distpack)
 
 openbsd-ppc64   openbsd    ppc64      (cross-compiled via distpack)
 
+openbsd-riscv64 openbsd    riscv64    (cross-compiled via distpack)
+
 plan9-386       plan9      386        (cross-compiled via distpack)
 
 plan9-amd64     plan9      amd64      (cross-compiled via distpack)
@@ -182,7 +186,7 @@ windows-arm64   windows    arm64      (cross-compiled via distpack)
 
 
 
-Targets for release 1.23
+Targets for release 1.24
 ================================================================================
 aix-ppc64       aix        ppc64      (cross-compiled via distpack)
 
@@ -271,8 +275,6 @@ windows-386     windows    386        (cross-compiled via distpack)
 windows-amd64   windows    amd64      (cross-compiled via distpack)
 	First class port
 
-windows-arm     windows    arm        (cross-compiled via distpack)
-
 windows-arm64   windows    arm64      (cross-compiled via distpack)
 
 

diff --git a/internal/releasetargets/releasetargets.go b/internal/releasetargets/releasetargets.go
@@ -57,8 +57,13 @@ func (rt ReleaseTargets) FirstClassPorts() map[OSArch]bool {
 // later release, set it to nil explicitly.
 // GOOS and GOARCH will be set automatically from the target name, but can be
 // overridden if necessary. Name will also be set and should not be overridden.
+//
+// TODO(dmitshur): Rename allReleases at some point. It currently tracks only
+// first class ports, everything else is generated from 'go tool dist list' output
+// via allPorts. The allReleases name was its original name, back when it really
+// was all releases.
 var allReleases = map[int]ReleaseTargets{
-	21: {
+	22: {
 		"darwin-amd64": &Target{
 			MinMacOSVersion: "10.15", // go.dev/issue/57125
 		},
@@ -86,6 +91,10 @@ var allReleases = map[int]ReleaseTargets{
 			MinMacOSVersion: "11", // go.dev/issue/64207
 		},
 	},
+	24: {
+		"windows-arm":   nil, // not first-class, leave it to allPorts
+		"windows-arm64": nil, // not first-class, leave it to allPorts
+	},
 }
 
 //go:generate ./genlatestports.bash