internal/relui,internal/task: add .0 to major versions

Updates most of relui to put .0 at the end of major version numbers.
Notably excluded is the GitHub milestone.

For golang/go#57631

Change-Id: Ieca2afaf4a5af4e90321e0dd68ac750a0077753a
Reviewed-on: https://go-review.googlesource.com/c/build/+/478577
Reviewed-by: Carlos Amedee <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Auto-Submit: Heschi Kreinick <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Run-TryBot: Heschi Kreinick <[email protected]>

Author: heschi

internal/relui/buildrelease_test.go

@@ -37,22 +37,24 @@ import (
 	"golang.org/x/build/internal/workflow"
 )
 
+func TestNonDistpack(t *testing.T) {
+	t.Run("minor", func(t *testing.T) {
+		testRelease(t, "go1.20", 20, "go1.20.1", task.KindCurrentMinor)
+	})
+}
+
 func TestRelease(t *testing.T) {
 	t.Run("beta", func(t *testing.T) {
-		testRelease(t, "go1.17", 18, "go1.18beta1", task.KindBeta)
+		testRelease(t, "go1.20", 21, "go1.21beta1", task.KindBeta)
 	})
 	t.Run("rc", func(t *testing.T) {
-		testRelease(t, "go1.17", 18, "go1.18rc1", task.KindRC)
+		testRelease(t, "go1.20", 21, "go1.21rc1", task.KindRC)
 	})
 	t.Run("major", func(t *testing.T) {
-		testRelease(t, "go1.17", 18, "go1.18", task.KindMajor)
+		testRelease(t, "go1.20", 21, "go1.21.0", task.KindMajor)
 	})
 }
 
-func TestDistpack(t *testing.T) {
-	testRelease(t, "go1.20", 21, "go1.21", task.KindMajor)
-}
-
 func TestSecurity(t *testing.T) {
 	t.Run("success", func(t *testing.T) {
 		testSecurity(t, true)

internal/relui/workflows.go

@@ -304,7 +304,7 @@ func registerProdReleaseWorkflows(ctx context.Context, h *DefinitionHolder, buil
 			securitySummary = wf.Param(wd, securitySummaryParameter)
 			securityFixes = wf.Param(wd, securityFixesParameter)
 		}
-		addCommTasks(wd, build, comm, wf.Slice(versionPublished), securitySummary, securityFixes, coordinators)
+		addCommTasks(wd, build, comm, r.kind, wf.Slice(versionPublished), securitySummary, securityFixes, coordinators)
 
 		h.RegisterDefinition(fmt.Sprintf("Go 1.%d %s", r.major, r.suffix), wd)
 	}
@@ -348,19 +348,19 @@ func createMinorReleaseWorkflow(build *BuildReleaseTasks, milestone *task.Milest
 
 	securitySummary := wf.Param(wd, securitySummaryParameter)
 	securityFixes := wf.Param(wd, securityFixesParameter)
-	addCommTasks(wd, build, comm, wf.Slice(v1Published, v2Published), securitySummary, securityFixes, coordinators)
+	addCommTasks(wd, build, comm, task.KindCurrentMinor, wf.Slice(v1Published, v2Published), securitySummary, securityFixes, coordinators)
 
 	return wd, nil
 }
 
 func addCommTasks(
 	wd *wf.Definition, build *BuildReleaseTasks, comm task.CommunicationTasks,
-	versions wf.Value[[]string], securitySummary wf.Value[string], securityFixes, coordinators wf.Value[[]string],
+	kind task.ReleaseKind, versions wf.Value[[]string], securitySummary wf.Value[string], securityFixes, coordinators wf.Value[[]string],
 ) {
 	okayToAnnounceAndTweet := wf.Action0(wd, "Wait to Announce", build.ApproveAction, wf.After(versions))
 
 	// Announce that a new Go release has been published.
-	sentMail := wf.Task3(wd, "mail-announcement", comm.AnnounceRelease, versions, securityFixes, coordinators, wf.After(okayToAnnounceAndTweet))
+	sentMail := wf.Task4(wd, "mail-announcement", comm.AnnounceRelease, wf.Const(kind), versions, securityFixes, coordinators, wf.After(okayToAnnounceAndTweet))
 	announcementURL := wf.Task1(wd, "await-announcement", comm.AwaitAnnounceMail, sentMail)
 	tweetURL := wf.Task3(wd, "post-tweet", comm.TweetRelease, versions, securitySummary, announcementURL, wf.After(okayToAnnounceAndTweet))
 
@@ -404,7 +404,7 @@ func addSingleReleaseWorkflow(
 	signedAndTestedArtifacts, modules := build.addBuildTasks(wd, major, nextVersion, timestamp, source)
 	okayToTagAndPublish := wf.Action0(wd, "Wait for Release Coordinator Approval", build.ApproveAction, wf.After(signedAndTestedArtifacts))
 
-	dlcl := wf.Task3(wd, "Mail DL CL", version.MailDLCL, wf.Slice(nextVersion), coordinators, wf.Const(false), wf.After(okayToTagAndPublish))
+	dlcl := wf.Task5(wd, "Mail DL CL", version.MailDLCL, wf.Const(major), kindVal, nextVersion, coordinators, wf.Const(false), wf.After(okayToTagAndPublish))
 	dlclCommit := wf.Task2(wd, "Wait for DL CL submission", version.AwaitCL, dlcl, wf.Const(""))
 	wf.Output(wd, "Download CL submitted", dlclCommit)
 

internal/task/announce.go

@@ -33,12 +33,15 @@ import (
 )
 
 type releaseAnnouncement struct {
+	// Kind is the kind of release being announced.
+	Kind ReleaseKind
+
 	// Version is the Go version that has been released.
 	//
 	// The version string must use the same format as Go tags. For example:
 	// 	• "go1.17.2" for a minor Go release
-	// 	• "go1.18" for a major Go release
-	// 	• "go1.18beta1" or "go1.18rc1" for a pre-release
+	// 	• "go1.21.0" for a major Go release
+	// 	• "go1.21beta1" or "go1.21rc1" for a pre-release
 	Version string
 	// SecondaryVersion is an older Go version that was also released.
 	// This only applies to minor releases when two releases are made.
@@ -129,7 +132,7 @@ type SentMail struct {
 }
 
 // AnnounceRelease sends an email announcing a Go release to Google Groups.
-func (t AnnounceMailTasks) AnnounceRelease(ctx *workflow.TaskContext, versions []string, security []string, users []string) (SentMail, error) {
+func (t AnnounceMailTasks) AnnounceRelease(ctx *workflow.TaskContext, kind ReleaseKind, versions []string, security []string, users []string) (SentMail, error) {
 	if deadline, ok := ctx.Deadline(); ok && time.Until(deadline) < time.Minute {
 		return SentMail{}, fmt.Errorf("insufficient time for announce release task; a minimum of a minute left on context is required")
 	}
@@ -142,6 +145,7 @@ func (t AnnounceMailTasks) AnnounceRelease(ctx *workflow.TaskContext, versions [
 	}
 
 	r := releaseAnnouncement{
+		Kind:     kind,
 		Version:  versions[0],
 		Security: security,
 		Names:    names,
@@ -307,18 +311,18 @@ func announcementMail(data any) (MailContent, error) {
 	var name string
 	switch r := data.(type) {
 	case releaseAnnouncement:
-		if i := strings.Index(r.Version, "beta"); i != -1 { // A beta release.
+		switch r.Kind {
+		case KindBeta:
 			name = "announce-beta.md"
-		} else if i := strings.Index(r.Version, "rc"); i != -1 { // Release Candidate.
+		case KindRC:
 			name = "announce-rc.md"
-		} else if strings.Count(r.Version, ".") == 1 { // Major release like "go1.X".
+		case KindMajor:
 			name = "announce-major.md"
-		} else if strings.Count(r.Version, ".") == 2 { // Minor release like "go1.X.Y".
+		case KindCurrentMinor, KindPrevMinor:
 			name = "announce-minor.md"
-		} else {
-			return MailContent{}, fmt.Errorf("unknown version format: %q", r.Version)
+		default:
+			return MailContent{}, fmt.Errorf("unknown release kind: %v", r.Kind)
 		}
-
 		if len(r.Security) > 0 && name != "announce-minor.md" {
 			// The Security field isn't supported in templates other than minor,
 			// so report an error instead of silently dropping it.

internal/task/announce_test.go

@@ -23,7 +23,7 @@ import (
 func TestAnnounceReleaseShortContext(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
-	_, err := (AnnounceMailTasks{}).AnnounceRelease(&workflow.TaskContext{Context: ctx}, []string{"go1.18.1", "go1.17.8"}, nil, nil)
+	_, err := (AnnounceMailTasks{}).AnnounceRelease(&workflow.TaskContext{Context: ctx}, KindCurrentMinor, []string{"go1.18.1", "go1.17.8"}, nil, nil)
 	if err == nil {
 		t.Errorf("want non-nil error")
 	} else if !strings.HasPrefix(err.Error(), "insufficient time") {
@@ -40,6 +40,7 @@ func TestAnnouncementMail(t *testing.T) {
 		{
 			name: "announce-minor",
 			in: releaseAnnouncement{
+				Kind:             KindCurrentMinor,
 				Version:          "go1.18.1",
 				SecondaryVersion: "go1.17.9",
 				Names:            []string{"Alice", "Bob", "Charlie"},
@@ -49,6 +50,7 @@ func TestAnnouncementMail(t *testing.T) {
 		{
 			name: "announce-minor-with-security",
 			in: releaseAnnouncement{
+				Kind:             KindCurrentMinor,
 				Version:          "go1.18.1",
 				SecondaryVersion: "go1.17.9",
 				Security: []string{
@@ -82,6 +84,7 @@ This is CVE-2022-27536 and https://go.dev/issue/51759.`,
 		{
 			name: "announce-minor-solo",
 			in: releaseAnnouncement{
+				Kind:     KindCurrentMinor,
 				Version:  "go1.11.1",
 				Security: []string{"abc: security fix 1", "xyz: security fix 2"},
 				Names:    []string{"Alice"},
@@ -91,23 +94,26 @@ This is CVE-2022-27536 and https://go.dev/issue/51759.`,
 		{
 			name: "announce-beta",
 			in: releaseAnnouncement{
+				Kind:    KindBeta,
 				Version: "go1.19beta5",
 			},
 			wantSubject: "Go 1.19 Beta 5 is released",
 		},
 		{
 			name: "announce-rc",
 			in: releaseAnnouncement{
+				Kind:    KindRC,
 				Version: "go1.19rc6",
 			},
 			wantSubject: "Go 1.19 Release Candidate 6 is released",
 		},
 		{
 			name: "announce-major",
 			in: releaseAnnouncement{
-				Version: "go1.19",
+				Kind:    KindMajor,
+				Version: "go1.21.0",
 			},
-			wantSubject: "Go 1.19 is released",
+			wantSubject: "Go 1.21.0 is released",
 		},
 
 		{
@@ -187,6 +193,7 @@ func TestAnnounceRelease(t *testing.T) {
 
 	tests := [...]struct {
 		name         string
+		kind         ReleaseKind
 		versions     []string
 		security     []string
 		coordinators []string
@@ -195,6 +202,7 @@ func TestAnnounceRelease(t *testing.T) {
 	}{
 		{
 			name:         "minor",
+			kind:         KindCurrentMinor,
 			versions:     []string{"go1.18.1", "go1.17.8"}, // Intentionally not 1.17.9 so the real email doesn't get in the way.
 			coordinators: []string{"heschi", "dmitshur"},
 			want:         SentMail{Subject: "Go 1.18.1 and Go 1.17.8 are released"},
@@ -255,7 +263,7 @@ Heschi and Dmitri for the Go team` + "\n",
 			}
 			var buf bytes.Buffer
 			ctx := &workflow.TaskContext{Context: context.Background(), Logger: fmtWriter{&buf}}
-			sentMail, err := tasks.AnnounceRelease(ctx, tc.versions, tc.security, tc.coordinators)
+			sentMail, err := tasks.AnnounceRelease(ctx, tc.kind, tc.versions, tc.security, tc.coordinators)
 			if err != nil {
 				t.Fatal("task function returned non-nil error:", err)
 			}

internal/task/dlcl.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"go/format"
 	"path"
-	"regexp"
 	"strings"
 	"text/template"
 	"time"
@@ -19,58 +18,46 @@ import (
 )
 
 // MailDLCL mails a golang.org/dl CL that adds commands for the
-// specified Go versions. It accepts one or two versions only.
+// specified Go version.
 //
-// The versions must use the same format as Go tags. For example:
+// The version must use the same format as Go tags. For example:
 //   - "go1.17.2" and "go1.16.9" for a minor Go release
-//   - "go1.18" for a major Go release
+//   - "go1.21.0" for a major Go release
 //   - "go1.18beta1" or "go1.18rc1" for a pre-release
 //
 // On success, the ID of the change is returned, like "dl~1234".
-func (t *VersionTasks) MailDLCL(ctx *workflow.TaskContext, versions []string, reviewers []string, dryRun bool) (changeID string, _ error) {
-	if err := oneOrTwoGoVersions(versions); err != nil {
-		return "", err
-	}
-
+func (t *VersionTasks) MailDLCL(ctx *workflow.TaskContext, major int, kind ReleaseKind, version string, reviewers []string, dryRun bool) (changeID string, _ error) {
 	var files = make(map[string]string) // Map key is relative path, and map value is file content.
 
 	// Generate main.go files for versions from the template.
-	for _, ver := range versions {
-		var buf bytes.Buffer
-		versionNoPatch, err := versionNoPatch(ver)
-		if err != nil {
-			return "", err
-		}
-		if err := dlTmpl.Execute(&buf, struct {
-			Year                int
-			Version             string // "go1.5.3rc2"
-			VersionNoPatch      string // "go1.5"
-			CapitalSpaceVersion string // "Go 1.5"
-			DocHost             string // "go.dev" or "tip.golang.org" for rc/beta
-		}{
-			Year:                time.Now().UTC().Year(),
-			Version:             ver,
-			VersionNoPatch:      versionNoPatch,
-			DocHost:             docHost(ver),
-			CapitalSpaceVersion: strings.Replace(ver, "go", "Go ", 1),
-		}); err != nil {
-			return "", fmt.Errorf("dlTmpl.Execute: %v", err)
-		}
-		gofmted, err := format.Source(buf.Bytes())
-		if err != nil {
-			return "", fmt.Errorf("could not gofmt: %v", err)
-		}
-		files[path.Join(ver, "main.go")] = string(gofmted)
-		ctx.Printf("file %q (command %q):\n%s", path.Join(ver, "main.go"), "golang.org/dl/"+ver, gofmted)
+	var buf bytes.Buffer
+	if err := dlTmpl.Execute(&buf, struct {
+		Year                int
+		Version             string // "go1.5.3rc2"
+		DocLink             string // "https://go.dev/doc/go1.5"
+		CapitalSpaceVersion string // "Go 1.5.0"
+	}{
+		Year:                time.Now().UTC().Year(),
+		Version:             version,
+		DocLink:             docLink(major, kind, version),
+		CapitalSpaceVersion: strings.Replace(version, "go", "Go ", 1),
+	}); err != nil {
+		return "", fmt.Errorf("dlTmpl.Execute: %v", err)
+	}
+	gofmted, err := format.Source(buf.Bytes())
+	if err != nil {
+		return "", fmt.Errorf("could not gofmt: %v", err)
 	}
+	files[path.Join(version, "main.go")] = string(gofmted)
+	ctx.Printf("file %q (command %q):\n%s", path.Join(version, "main.go"), "golang.org/dl/"+version, gofmted)
 
 	// Create a Gerrit CL using the Gerrit API.
 	if dryRun {
 		return "(dry-run)", nil
 	}
 	changeInput := gerrit.ChangeInput{
 		Project: "dl",
-		Subject: "dl: add " + strings.Join(versions, " and "),
+		Subject: "dl: add " + version,
 		Branch:  "master",
 	}
 	return t.Gerrit.CreateAutoSubmitChange(ctx, changeInput, reviewers, files)
@@ -94,23 +81,16 @@ func oneOrTwoGoVersions(versions []string) error {
 	return nil
 }
 
-func docHost(ver string) string {
-	if strings.Contains(ver, "rc") || strings.Contains(ver, "beta") {
-		return "tip.golang.org"
+func docLink(major int, kind ReleaseKind, ver string) string {
+	if kind == KindCurrentMinor || kind == KindPrevMinor {
+		return fmt.Sprintf("https://go.dev/doc/devel/release#%v", ver)
 	}
-	return "go.dev"
-}
 
-func versionNoPatch(ver string) (string, error) {
-	rx := regexp.MustCompile(`^(go\d+\.\d+)($|[\.]?\d*)($|rc|beta|\.)`)
-	m := rx.FindStringSubmatch(ver)
-	if m == nil {
-		return "", fmt.Errorf("unrecognized version %q", ver)
-	}
-	if m[2] != "" {
-		return "devel/release#" + m[1] + ".minor", nil
+	host := "go.dev"
+	if kind == KindBeta || kind == KindRC {
+		host = "tip.golang.org"
 	}
-	return m[1], nil
+	return fmt.Sprintf("https://%v/doc/go1.%d", host, major)
 }
 
 var dlTmpl = template.Must(template.New("").Parse(`// Copyright {{.Year}} The Go Authors. All rights reserved.
@@ -127,7 +107,7 @@ var dlTmpl = template.Must(template.New("").Parse(`// Copyright {{.Year}} The Go
 // And then use the {{.Version}} command as if it were your normal go
 // command.
 //
-// See the release notes at https://{{.DocHost}}/doc/{{.VersionNoPatch}}.
+// See the release notes at {{.DocLink}}.
 //
 // File bugs at https://go.dev/issue/new.
 package main