From 422d3b078d392bbb6cc6a7094f787b7c5bbff311 Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Fri, 8 Sep 2023 14:10:01 -0400 Subject: [PATCH] internal/releasetargets: drop Go 1.19 targets There won't be new Go 1.19 releases per go.dev/doc/devel/release#policy. For golang/go#62076. For golang/go#40561. Change-Id: I30e09c9f47ec0006caeb67e15e03b8cdbff7c175 Reviewed-on: https://go-review.googlesource.com/c/build/+/527017 Auto-Submit: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Carlos Amedee Reviewed-by: Dmitri Shuralyov --- internal/releasetargets/releases.txt | 53 ---------------- internal/releasetargets/releasetargets.go | 77 +++++------------------ 2 files changed, 17 insertions(+), 113 deletions(-) diff --git a/internal/releasetargets/releases.txt b/internal/releasetargets/releases.txt index f1bdf5498a..593e4d8bba 100644 --- a/internal/releasetargets/releases.txt +++ b/internal/releasetargets/releases.txt @@ -1,56 +1,3 @@ -Targets for release 1.19 -================================================================================ -darwin-amd64 darwin amd64 darwin-amd64-12_0 - Race enabled - Extra env: ["CGO_CFLAGS=-mmacosx-version-min=10.13"] - Running on reverse builder: AWS macOS Monterey (12) VM under QEMU - -darwin-arm64 darwin arm64 darwin-arm64-12 - Race enabled - Running on reverse builder: macOS Monterey (12) ARM64 (M1) on Mac minis in a Google office - -freebsd-386 freebsd 386 freebsd-386-12_3 - Running on GCP - -freebsd-amd64 freebsd amd64 freebsd-amd64-12_3 - Race enabled - Running on GCP - -linux-386 linux 386 linux-386-buster - Long tests on linux-386-longtest - Running on GCP - -linux-amd64 linux amd64 linux-amd64-buster - Race enabled, Long tests on linux-amd64-longtest - Running on GCP - -linux-arm64 linux arm64 linux-arm64 - Running on GCP - -linux-armv6l linux arm linux-arm-aws - Extra env: ["GOARM=6"] - Running on AWS - -linux-ppc64le linux ppc64le linux-ppc64le-buildlet - Build only - Running on reverse builder: Ubuntu 20.04; run by Go team on osuosl.org; see x/build/env/linux-ppc64le/osuosl - -linux-s390x linux s390x linux-s390x-crosscompile - Build only - Running on GCP - -windows-386 windows 386 windows-386-2008-oldcc - Running on GCP - -windows-amd64 windows amd64 windows-amd64-2008-oldcc - Race enabled, Long tests on windows-amd64-longtest-oldcc - Running on GCP - -windows-arm64 windows arm64 windows-arm64-11 - Running on reverse builder: Azure windows 11 arm64 VMs - - - Targets for release 1.20 ================================================================================ darwin-amd64 darwin amd64 darwin-amd64-13 diff --git a/internal/releasetargets/releasetargets.go b/internal/releasetargets/releasetargets.go index 5fff7c0582..20ad78c212 100644 --- a/internal/releasetargets/releasetargets.go +++ b/internal/releasetargets/releasetargets.go @@ -61,29 +61,27 @@ func (rt ReleaseTargets) FirstClassPorts() map[OSArch]bool { // 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. var allReleases = map[int]ReleaseTargets{ - 19: { + 20: { + // 1.20 drops Race .as from the distribution. "darwin-amd64": &Target{ - Builder: "darwin-amd64-12_0", - Race: true, + Builder: "darwin-amd64-13", MinMacOSVersion: "10.13", // Issues #36025 #35459 ExtraEnv: []string{"CGO_CFLAGS=-mmacosx-version-min=10.13"}, // Issues #36025 #35459 }, "darwin-arm64": &Target{ Builder: "darwin-arm64-12", - Race: true, MinMacOSVersion: "11", // Big Sur was the first release with M1 support. }, "freebsd-386": &Target{ SecondClass: true, - Builder: "freebsd-386-12_3", + Builder: "freebsd-386-13_0", }, "freebsd-amd64": &Target{ SecondClass: true, - Builder: "freebsd-amd64-12_3", - Race: true, + Builder: "freebsd-amd64-13_0", }, "linux-386": &Target{ - Builder: "linux-386-buster", + Builder: "linux-386-bullseye", LongTestBuilder: "linux-386-longtest", }, "linux-armv6l": &Target{ @@ -91,68 +89,23 @@ var allReleases = map[int]ReleaseTargets{ Builder: "linux-arm-aws", ExtraEnv: []string{"GOARM=6"}, }, - "linux-arm64": &Target{ - Builder: "linux-arm64", - }, "linux-amd64": &Target{ - Builder: "linux-amd64-buster", + Builder: "linux-amd64-bullseye", LongTestBuilder: "linux-amd64-longtest", - Race: true, }, - "linux-s390x": &Target{ - SecondClass: true, - Builder: "linux-s390x-crosscompile", - BuildOnly: true, + "linux-arm64": &Target{ + Builder: "linux-arm64", + LongTestBuilder: "linux-arm64-longtest", }, "linux-ppc64le": &Target{ SecondClass: true, Builder: "linux-ppc64le-buildlet", BuildOnly: true, }, - // *-oldcc amd64/386 builders needed for 1.18, 1.19 - "windows-386": &Target{ - Builder: "windows-386-2008-oldcc", - }, - "windows-amd64": &Target{ - Builder: "windows-amd64-2008-oldcc", - LongTestBuilder: "windows-amd64-longtest-oldcc", - Race: true, - }, - "windows-arm64": &Target{ - SecondClass: true, - Builder: "windows-arm64-11", - }, - }, - 20: { - // 1.20 drops Race .as from the distribution. - "darwin-amd64": &Target{ - Builder: "darwin-amd64-13", - MinMacOSVersion: "10.13", // Issues #36025 #35459 - ExtraEnv: []string{"CGO_CFLAGS=-mmacosx-version-min=10.13"}, // Issues #36025 #35459 - }, - "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{ + "linux-s390x": &Target{ SecondClass: true, - Builder: "freebsd-amd64-13_0", - }, - "linux-386": &Target{ - Builder: "linux-386-bullseye", - LongTestBuilder: "linux-386-longtest", - }, - "linux-arm64": &Target{ - Builder: "linux-arm64", - LongTestBuilder: "linux-arm64-longtest", - }, - "linux-amd64": &Target{ - Builder: "linux-amd64-bullseye", - LongTestBuilder: "linux-amd64-longtest", + Builder: "linux-s390x-crosscompile", + BuildOnly: true, }, "windows-386": &Target{ Builder: "windows-386-2008", @@ -161,6 +114,10 @@ var allReleases = map[int]ReleaseTargets{ Builder: "windows-amd64-2008", LongTestBuilder: "windows-amd64-longtest", }, + "windows-arm64": &Target{ + SecondClass: true, + Builder: "windows-arm64-11", + }, }, 21: { "darwin-amd64": &Target{