internal/releasetargets: rename allReleases to allFirstClass
A minor clean-up to leave it in a more readable state.
Change-Id: Ia0811df0c9da569be2d08ae1b57da81fdc520056
Reviewed-on: https://go-review.googlesource.com/c/build/+/612556
Reviewed-by: Tim King <taking@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/internal/releasetargets/releasetargets.go b/internal/releasetargets/releasetargets.go
index b0f977a..43aa1fd 100644
--- a/internal/releasetargets/releasetargets.go
+++ b/internal/releasetargets/releasetargets.go
@@ -51,18 +51,13 @@
return result
}
-// allReleases contains all the targets for all releases we're currently
+// allFirstClass lists first-class port targets for all releases we're currently
// supporting. To reduce duplication, targets from earlier versions are
// propagated forward unless overridden. To stop configuring a target in a
// 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{
+var allFirstClass = map[int]ReleaseTargets{
22: {
"darwin-amd64": &Target{
MinMacOSVersion: "10.15", // go.dev/issue/57125
@@ -79,12 +74,6 @@
"linux-arm64": &Target{},
"windows-386": &Target{},
"windows-amd64": &Target{},
- "windows-arm": &Target{
- SecondClass: true,
- },
- "windows-arm64": &Target{
- SecondClass: true,
- },
},
23: {
"darwin-amd64": &Target{
@@ -92,8 +81,7 @@
},
},
24: {
- "windows-arm": nil, // not first-class, leave it to allPorts
- "windows-arm64": nil, // not first-class, leave it to allPorts
+ // There aren't any release target changes specific to Go 1.24 at this time.
},
}
@@ -103,7 +91,7 @@
var allPorts = map[int][]OSArch{}
func init() {
- for _, targets := range allReleases {
+ for _, targets := range allFirstClass {
for name, target := range targets {
if target == nil {
continue
@@ -147,7 +135,7 @@
func sortedReleases() []int {
var releases []int
- for rel := range allReleases {
+ for rel := range allFirstClass {
releases = append(releases, rel)
}
for rel := range allPorts {
@@ -173,28 +161,28 @@
if release > x {
break
}
- for osarch, target := range allReleases[release] {
+ for osArch, target := range allFirstClass[release] {
if target == nil {
- delete(targets, osarch)
+ delete(targets, osArch)
} else {
copy := *target
- targets[osarch] = ©
+ targets[osArch] = ©
}
}
if p, ok := allPorts[release]; ok {
ports = p
}
}
- for _, osarch := range ports {
- _, unbuildable := unbuildableOSs[osarch.OS]
- _, exists := targets[osarch.String()]
+ for _, osArch := range ports {
+ _, unbuildable := unbuildableOSs[osArch.OS]
+ _, exists := targets[osArch.String()]
if unbuildable || exists {
continue
}
- targets[osarch.String()] = &Target{
- Name: osarch.String(),
- GOOS: osarch.OS,
- GOARCH: osarch.Arch,
+ targets[osArch.String()] = &Target{
+ Name: osArch.String(),
+ GOOS: osArch.OS,
+ GOARCH: osArch.Arch,
SecondClass: true,
}
}
diff --git a/internal/releasetargets/releasetargets_test.go b/internal/releasetargets/releasetargets_test.go
index dcfc6f0..64f0a62 100644
--- a/internal/releasetargets/releasetargets_test.go
+++ b/internal/releasetargets/releasetargets_test.go
@@ -20,7 +20,7 @@
func TestReleaseTargets(t *testing.T) {
releases := sortedReleases()
if len(releases) < 3 {
- t.Errorf("sortedReleases returned %v (len %d); allReleases map and allports/go1.n.txt files are expected to cover a minimum of 3 releases (prev + curr + tip)", releases, len(releases))
+ t.Errorf("sortedReleases returned %v (len %d); allFirstClass map and allports/go1.n.txt files are expected to cover a minimum of 3 releases (prev + curr + tip)", releases, len(releases))
}
var out bytes.Buffer
for _, rel := range releases {
