diff --git a/internal/releasetargets/releases.txt b/internal/releasetargets/releases.txt index 3b2eac517e..a93e925892 100644 --- a/internal/releasetargets/releases.txt +++ b/internal/releasetargets/releases.txt @@ -1,204 +1,182 @@ Targets for release 1.21 ================================================================================ -aix-ppc64 aix ppc64 (cross-compiled, no tests) +aix-ppc64 aix ppc64 (cross-compiled via distpack) -darwin-amd64 darwin amd64 darwin-amd64-13 - Long tests on darwin-amd64-longtest, Minimum macOS version is 10.15 - Running on reverse builder: AWS macOS Ventura (13) VM under QEMU +darwin-amd64 darwin amd64 (cross-compiled via distpack) + First class port, Minimum macOS version is 10.15 -darwin-arm64 darwin arm64 darwin-arm64-12 - Minimum macOS version is 11 - Running on reverse builder: macOS Monterey (12) ARM64 (M1) on Mac minis in a Google office +darwin-arm64 darwin arm64 (cross-compiled via distpack) + First class port, Minimum macOS version is 11 -dragonfly-amd64 dragonfly amd64 (cross-compiled, no tests) +dragonfly-amd64 dragonfly amd64 (cross-compiled via distpack) -freebsd-386 freebsd 386 freebsd-386-13_0 - Running on GCP +freebsd-386 freebsd 386 (cross-compiled via distpack) -freebsd-amd64 freebsd amd64 freebsd-amd64-13_0 - Running on GCP +freebsd-amd64 freebsd amd64 (cross-compiled via distpack) -freebsd-arm freebsd arm (cross-compiled, no tests) +freebsd-arm freebsd arm (cross-compiled via distpack) -freebsd-arm64 freebsd arm64 (cross-compiled, no tests) +freebsd-arm64 freebsd arm64 (cross-compiled via distpack) -freebsd-riscv64 freebsd riscv64 (cross-compiled, no tests) +freebsd-riscv64 freebsd riscv64 (cross-compiled via distpack) -illumos-amd64 illumos amd64 (cross-compiled, no tests) +illumos-amd64 illumos amd64 (cross-compiled via distpack) -linux-386 linux 386 linux-386-bullseye - Long tests on linux-386-longtest - Running on GCP +linux-386 linux 386 (cross-compiled via distpack) + First class port -linux-amd64 linux amd64 linux-amd64-bullseye - Long tests on linux-amd64-longtest - Running on GCP +linux-amd64 linux amd64 (cross-compiled via distpack) + First class port -linux-arm64 linux arm64 linux-arm64 - Long tests on linux-arm64-longtest - Running on GCP +linux-arm64 linux arm64 (cross-compiled via distpack) + First class port -linux-armv6l linux arm linux-arm-aws +linux-armv6l linux arm (cross-compiled via distpack) + First class port Extra env: ["GOARM=6"] - Running on AWS -linux-loong64 linux loong64 (cross-compiled, no tests) +linux-loong64 linux loong64 (cross-compiled via distpack) -linux-mips linux mips (cross-compiled, no tests) +linux-mips linux mips (cross-compiled via distpack) -linux-mips64 linux mips64 (cross-compiled, no tests) +linux-mips64 linux mips64 (cross-compiled via distpack) -linux-mips64le linux mips64le (cross-compiled, no tests) +linux-mips64le linux mips64le (cross-compiled via distpack) -linux-mipsle linux mipsle (cross-compiled, no tests) +linux-mipsle linux mipsle (cross-compiled via distpack) -linux-ppc64 linux ppc64 (cross-compiled, no tests) +linux-ppc64 linux ppc64 (cross-compiled via distpack) -linux-ppc64le linux ppc64le (cross-compiled, no tests) +linux-ppc64le linux ppc64le (cross-compiled via distpack) -linux-riscv64 linux riscv64 (cross-compiled, no tests) +linux-riscv64 linux riscv64 (cross-compiled via distpack) -linux-s390x linux s390x (cross-compiled, no tests) +linux-s390x linux s390x (cross-compiled via distpack) -netbsd-386 netbsd 386 (cross-compiled, no tests) +netbsd-386 netbsd 386 (cross-compiled via distpack) -netbsd-amd64 netbsd amd64 (cross-compiled, no tests) +netbsd-amd64 netbsd amd64 (cross-compiled via distpack) -netbsd-arm netbsd arm (cross-compiled, no tests) +netbsd-arm netbsd arm (cross-compiled via distpack) -netbsd-arm64 netbsd arm64 (cross-compiled, no tests) +netbsd-arm64 netbsd arm64 (cross-compiled via distpack) -openbsd-386 openbsd 386 (cross-compiled, no tests) +openbsd-386 openbsd 386 (cross-compiled via distpack) -openbsd-amd64 openbsd amd64 (cross-compiled, no tests) +openbsd-amd64 openbsd amd64 (cross-compiled via distpack) -openbsd-arm openbsd arm (cross-compiled, no tests) +openbsd-arm openbsd arm (cross-compiled via distpack) -openbsd-arm64 openbsd arm64 (cross-compiled, no tests) +openbsd-arm64 openbsd arm64 (cross-compiled via distpack) -plan9-386 plan9 386 (cross-compiled, no tests) +plan9-386 plan9 386 (cross-compiled via distpack) -plan9-amd64 plan9 amd64 (cross-compiled, no tests) +plan9-amd64 plan9 amd64 (cross-compiled via distpack) -plan9-arm plan9 arm (cross-compiled, no tests) +plan9-arm plan9 arm (cross-compiled via distpack) -solaris-amd64 solaris amd64 (cross-compiled, no tests) +solaris-amd64 solaris amd64 (cross-compiled via distpack) -windows-386 windows 386 windows-386-2016 - Running on GCP +windows-386 windows 386 (cross-compiled via distpack) + First class port -windows-amd64 windows amd64 windows-amd64-2016 - Long tests on windows-amd64-longtest - Running on GCP +windows-amd64 windows amd64 (cross-compiled via distpack) + First class port -windows-arm windows arm windows-arm64-11 - Build only - Running on reverse builder: Azure windows 11 arm64 VMs +windows-arm windows arm (cross-compiled via distpack) -windows-arm64 windows arm64 windows-arm64-11 - Running on reverse builder: Azure windows 11 arm64 VMs +windows-arm64 windows arm64 (cross-compiled via distpack) Targets for release 1.23 ================================================================================ -aix-ppc64 aix ppc64 (cross-compiled, no tests) +aix-ppc64 aix ppc64 (cross-compiled via distpack) -darwin-amd64 darwin amd64 darwin-amd64-13 - Long tests on darwin-amd64-longtest, Minimum macOS version is 11 - Running on reverse builder: AWS macOS Ventura (13) VM under QEMU +darwin-amd64 darwin amd64 (cross-compiled via distpack) + First class port, Minimum macOS version is 11 -darwin-arm64 darwin arm64 darwin-arm64-12 - Minimum macOS version is 11 - Running on reverse builder: macOS Monterey (12) ARM64 (M1) on Mac minis in a Google office +darwin-arm64 darwin arm64 (cross-compiled via distpack) + First class port, Minimum macOS version is 11 -dragonfly-amd64 dragonfly amd64 (cross-compiled, no tests) +dragonfly-amd64 dragonfly amd64 (cross-compiled via distpack) -freebsd-386 freebsd 386 freebsd-386-13_0 - Running on GCP +freebsd-386 freebsd 386 (cross-compiled via distpack) -freebsd-amd64 freebsd amd64 freebsd-amd64-13_0 - Running on GCP +freebsd-amd64 freebsd amd64 (cross-compiled via distpack) -freebsd-arm freebsd arm (cross-compiled, no tests) +freebsd-arm freebsd arm (cross-compiled via distpack) -freebsd-arm64 freebsd arm64 (cross-compiled, no tests) +freebsd-arm64 freebsd arm64 (cross-compiled via distpack) -freebsd-riscv64 freebsd riscv64 (cross-compiled, no tests) +freebsd-riscv64 freebsd riscv64 (cross-compiled via distpack) -illumos-amd64 illumos amd64 (cross-compiled, no tests) +illumos-amd64 illumos amd64 (cross-compiled via distpack) -linux-386 linux 386 linux-386-bullseye - Long tests on linux-386-longtest - Running on GCP +linux-386 linux 386 (cross-compiled via distpack) + First class port -linux-amd64 linux amd64 linux-amd64-bullseye - Long tests on linux-amd64-longtest - Running on GCP +linux-amd64 linux amd64 (cross-compiled via distpack) + First class port -linux-arm64 linux arm64 linux-arm64 - Long tests on linux-arm64-longtest - Running on GCP +linux-arm64 linux arm64 (cross-compiled via distpack) + First class port -linux-armv6l linux arm linux-arm-aws +linux-armv6l linux arm (cross-compiled via distpack) + First class port Extra env: ["GOARM=6"] - Running on AWS -linux-loong64 linux loong64 (cross-compiled, no tests) +linux-loong64 linux loong64 (cross-compiled via distpack) -linux-mips linux mips (cross-compiled, no tests) +linux-mips linux mips (cross-compiled via distpack) -linux-mips64 linux mips64 (cross-compiled, no tests) +linux-mips64 linux mips64 (cross-compiled via distpack) -linux-mips64le linux mips64le (cross-compiled, no tests) +linux-mips64le linux mips64le (cross-compiled via distpack) -linux-mipsle linux mipsle (cross-compiled, no tests) +linux-mipsle linux mipsle (cross-compiled via distpack) -linux-ppc64 linux ppc64 (cross-compiled, no tests) +linux-ppc64 linux ppc64 (cross-compiled via distpack) -linux-ppc64le linux ppc64le (cross-compiled, no tests) +linux-ppc64le linux ppc64le (cross-compiled via distpack) -linux-riscv64 linux riscv64 (cross-compiled, no tests) +linux-riscv64 linux riscv64 (cross-compiled via distpack) -linux-s390x linux s390x (cross-compiled, no tests) +linux-s390x linux s390x (cross-compiled via distpack) -netbsd-386 netbsd 386 (cross-compiled, no tests) +netbsd-386 netbsd 386 (cross-compiled via distpack) -netbsd-amd64 netbsd amd64 (cross-compiled, no tests) +netbsd-amd64 netbsd amd64 (cross-compiled via distpack) -netbsd-arm netbsd arm (cross-compiled, no tests) +netbsd-arm netbsd arm (cross-compiled via distpack) -netbsd-arm64 netbsd arm64 (cross-compiled, no tests) +netbsd-arm64 netbsd arm64 (cross-compiled via distpack) -openbsd-386 openbsd 386 (cross-compiled, no tests) +openbsd-386 openbsd 386 (cross-compiled via distpack) -openbsd-amd64 openbsd amd64 (cross-compiled, no tests) +openbsd-amd64 openbsd amd64 (cross-compiled via distpack) -openbsd-arm openbsd arm (cross-compiled, no tests) +openbsd-arm openbsd arm (cross-compiled via distpack) -openbsd-arm64 openbsd arm64 (cross-compiled, no tests) +openbsd-arm64 openbsd arm64 (cross-compiled via distpack) -plan9-386 plan9 386 (cross-compiled, no tests) +plan9-386 plan9 386 (cross-compiled via distpack) -plan9-amd64 plan9 amd64 (cross-compiled, no tests) +plan9-amd64 plan9 amd64 (cross-compiled via distpack) -plan9-arm plan9 arm (cross-compiled, no tests) +plan9-arm plan9 arm (cross-compiled via distpack) -solaris-amd64 solaris amd64 (cross-compiled, no tests) +solaris-amd64 solaris amd64 (cross-compiled via distpack) -windows-386 windows 386 windows-386-2016 - Running on GCP +windows-386 windows 386 (cross-compiled via distpack) + First class port -windows-amd64 windows amd64 windows-amd64-2016 - Long tests on windows-amd64-longtest - Running on GCP +windows-amd64 windows amd64 (cross-compiled via distpack) + First class port -windows-arm windows arm windows-arm64-11 - Build only - Running on reverse builder: Azure windows 11 arm64 VMs +windows-arm windows arm (cross-compiled via distpack) -windows-arm64 windows arm64 windows-arm64-11 - Running on reverse builder: Azure windows 11 arm64 VMs +windows-arm64 windows arm64 (cross-compiled via distpack) diff --git a/internal/releasetargets/releasetargets.go b/internal/releasetargets/releasetargets.go index 631b88a7fb..92fb6ca4dc 100644 --- a/internal/releasetargets/releasetargets.go +++ b/internal/releasetargets/releasetargets.go @@ -16,13 +16,10 @@ import ( ) type Target struct { - Name string - GOOS, GOARCH string - SecondClass bool - Builder string - BuildOnly bool - LongTestBuilder string - ExtraEnv []string // Extra environment variables set during toolchain build. + Name string + GOOS, GOARCH string + SecondClass bool // A port that is not a first class port. See go.dev/wiki/PortingPolicy#first-class-ports. + ExtraEnv []string // Extra environment variables set during toolchain build. // For Darwin targets, the minimum targeted version, e.g. 10.13 or 13. MinMacOSVersion string @@ -62,60 +59,29 @@ func (rt ReleaseTargets) FirstClassPorts() map[OSArch]bool { var allReleases = map[int]ReleaseTargets{ 21: { "darwin-amd64": &Target{ - Builder: "darwin-amd64-13", - LongTestBuilder: "darwin-amd64-longtest", MinMacOSVersion: "10.15", // go.dev/issue/57125 }, "darwin-arm64": &Target{ - Builder: "darwin-arm64-12", MinMacOSVersion: "11", // Big Sur was the first release with M1 support. }, - "freebsd-386": &Target{ - SecondClass: true, - Builder: "freebsd-386-13_0", - }, - "freebsd-amd64": &Target{ - SecondClass: true, - Builder: "freebsd-amd64-13_0", - }, - "linux-386": &Target{ - Builder: "linux-386-bullseye", - LongTestBuilder: "linux-386-longtest", - }, + "linux-386": &Target{}, "linux-armv6l": &Target{ GOARCH: "arm", - Builder: "linux-arm-aws", ExtraEnv: []string{"GOARM=6"}, }, - "linux-amd64": &Target{ - Builder: "linux-amd64-bullseye", - LongTestBuilder: "linux-amd64-longtest", - }, - "linux-arm64": &Target{ - Builder: "linux-arm64", - LongTestBuilder: "linux-arm64-longtest", - }, - "windows-386": &Target{ - Builder: "windows-386-2016", - }, - "windows-amd64": &Target{ - Builder: "windows-amd64-2016", - LongTestBuilder: "windows-amd64-longtest", - }, + "linux-amd64": &Target{}, + "linux-arm64": &Target{}, + "windows-386": &Target{}, + "windows-amd64": &Target{}, "windows-arm": &Target{ - Builder: "windows-arm64-11", // Windows builds need a builder to create their MSIs. SecondClass: true, - BuildOnly: true, }, "windows-arm64": &Target{ SecondClass: true, - Builder: "windows-arm64-11", }, }, 23: { "darwin-amd64": &Target{ - Builder: "darwin-amd64-13", - LongTestBuilder: "darwin-amd64-longtest", MinMacOSVersion: "11", // go.dev/issue/64207 }, }, @@ -217,7 +183,6 @@ func TargetsForGo1Point(x int) ReleaseTargets { GOOS: osarch.OS, GOARCH: osarch.Arch, SecondClass: true, - BuildOnly: true, } } return targets diff --git a/internal/releasetargets/releasetargets_test.go b/internal/releasetargets/releasetargets_test.go index 0c347666ef..bb75050673 100644 --- a/internal/releasetargets/releasetargets_test.go +++ b/internal/releasetargets/releasetargets_test.go @@ -15,9 +15,6 @@ import ( "sort" "strings" "testing" - - "golang.org/x/build/dashboard" - "golang.org/x/build/internal/coordinator/pool" ) var update = flag.Bool("update", false, "controls whether to update releases.txt") @@ -51,19 +48,11 @@ func printRelease(w io.Writer, release int, targets ReleaseTargets) { } sort.Strings(targetNames) for _, name := range targetNames { + const builder = "(cross-compiled via distpack)" target := targets[name] var flags []string - builder := target.Builder - if target.BuildOnly { - if builder == "" { - builder = "(cross-compiled, no tests)" - } else { - flags = append(flags, "Build only") - } - - } - if target.LongTestBuilder != "" { - flags = append(flags, "Long tests on "+target.LongTestBuilder) + if !target.SecondClass { + flags = append(flags, "First class port") } if target.MinMacOSVersion != "" { flags = append(flags, "Minimum macOS version is "+target.MinMacOSVersion) @@ -75,39 +64,8 @@ func printRelease(w io.Writer, release int, targets ReleaseTargets) { if len(target.ExtraEnv) != 0 { fmt.Fprintf(w, "\tExtra env: %q\n", target.ExtraEnv) } - if bc, ok := dashboard.Builders[target.Builder]; ok { - var runningOn string - switch pool.ForHost(bc.HostConfig()).(type) { - case *pool.EC2Buildlet: - runningOn = "AWS" - case *pool.GCEBuildlet: - runningOn = "GCP" - case *pool.ReverseBuildletPool: - runningOn = fmt.Sprintf("reverse builder: %v", bc.HostConfig().Notes) - default: - runningOn = "unknown" - } - fmt.Fprintf(w, "\tRunning on %v\n", runningOn) - } fmt.Fprintf(w, "\n") } fmt.Fprintf(w, "\n\n") } - -func TestBuildersExist(t *testing.T) { - for _, rel := range allReleases { - for _, target := range rel { - if target == nil || target.Builder == "" { - continue - } - _, ok := dashboard.Builders[target.Builder] - if !ok { - t.Errorf("missing builder: %q", target.Builder) - } - if _, ok := dashboard.Builders[target.LongTestBuilder]; target.LongTestBuilder != "" && !ok { - t.Errorf("missing longtest builder: %q", target.LongTestBuilder) - } - } - } -}