internal/relui, internal/task: merge KindCurrentMinor and KindPrevMinor

Unfortunately, KindPrevMinor doesn't work for the one-off Go 1.19.x
release, because GetNextVersion(KindPrevMinor) gets the next Go 1.20.x
minor version, not the next Go 1.19.x minor version. So GetNextVersion
needs some change, or its callers do.

Almost all tasks already have access to the major version number, and
other than GetNextVersion itself, pretty much everything else treats
KindCurrentMinor and KindPrevMinor interchangeably. In fact, when relui
was just being started, we kept forgetting to handle both of them.

Instead of trying to add KindPrevPrevMinor or some 1.19-specific hack,
it seems simpler to give GetNextVersion the major explicitly and leave
only KindMinor behind.

For golang/go#62076.

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

Author: dmitshur

internal/relui/buildrelease_test.go

@@ -41,7 +41,7 @@ import (
 
 func TestNonDistpack(t *testing.T) {
 	t.Run("minor", func(t *testing.T) {
-		testRelease(t, "go1.20", 20, "go1.20.1", task.KindCurrentMinor)
+		testRelease(t, "go1.20", 20, "go1.20.1", task.KindMinor)
 	})
 }
 

internal/relui/workflows.go

@@ -244,17 +244,16 @@ func RegisterReleaseWorkflows(ctx context.Context, h *DefinitionHolder, build *B
 		return err
 	}
 	releases := []struct {
-		kinds []task.ReleaseKind
-		name  string
+		majors []int
 	}{
-		{[]task.ReleaseKind{task.KindCurrentMinor, task.KindPrevMinor}, fmt.Sprintf("next minor release for Go 1.%d and 1.%d", currentMajor, currentMajor-1)},
-		{[]task.ReleaseKind{task.KindCurrentMinor}, fmt.Sprintf("next minor release for Go 1.%d", currentMajor)},
-		{[]task.ReleaseKind{task.KindPrevMinor}, fmt.Sprintf("next minor release for Go 1.%d", currentMajor-1)},
+		{[]int{currentMajor, currentMajor - 1}}, // Both minors.
+		{[]int{currentMajor}},                   // Current minor only.
+		{[]int{currentMajor - 1}},               // Previous minor only.
 	}
 	for _, r := range releases {
 		wd := wf.New()
 
-		versions := wf.Task1(wd, "Get next versions", version.GetNextVersions, wf.Const(r.kinds))
+		versions := wf.Task1(wd, "Get next versions", version.GetNextMinorVersions, wf.Const(r.majors))
 		targetDate := wf.Param(wd, targetDateParam)
 		securityContent := wf.Param(wd, securityPreAnnParam)
 		cves := wf.Param(wd, securityPreAnnCVEsParam)
@@ -263,7 +262,11 @@ func RegisterReleaseWorkflows(ctx context.Context, h *DefinitionHolder, build *B
 		sentMail := wf.Task5(wd, "mail-pre-announcement", comm.PreAnnounceRelease, versions, targetDate, securityContent, cves, coordinators)
 		wf.Output(wd, "Pre-announcement URL", wf.Task1(wd, "await-pre-announcement", comm.AwaitAnnounceMail, sentMail))
 
-		h.RegisterDefinition("pre-announce "+r.name, wd)
+		var names []string
+		for _, m := range r.majors {
+			names = append(names, fmt.Sprintf("1.%d", m))
+		}
+		h.RegisterDefinition("pre-announce next minor release for Go "+strings.Join(names, " and "), wd)
 	}
 
 	// Register workflows for miscellaneous tasks that happen as part of the Go release cycle.
@@ -306,20 +309,20 @@ func registerProdReleaseWorkflows(ctx context.Context, h *DefinitionHolder, buil
 		return err
 	}
 	type release struct {
-		kind   task.ReleaseKind
 		major  int
+		kind   task.ReleaseKind
 		suffix string
 	}
 	releases := []release{
-		{task.KindMajor, currentMajor + 1, "final"},
-		{task.KindRC, currentMajor + 1, "next RC"},
-		{task.KindBeta, currentMajor + 1, "next beta"},
-		{task.KindCurrentMinor, currentMajor, "next minor"},
-		{task.KindPrevMinor, currentMajor - 1, "next minor"},
-		{task.KindPrevMinor, currentMajor - 2, "next minor"}, // TODO(go.dev/issue/62076): Remove after Go 1.19.13 is out.
+		{currentMajor + 1, task.KindMajor, "final"},
+		{currentMajor + 1, task.KindRC, "next RC"},
+		{currentMajor + 1, task.KindBeta, "next beta"},
+		{currentMajor, task.KindMinor, "next minor"},     // Current minor only.
+		{currentMajor - 1, task.KindMinor, "next minor"}, // Previous minor only.
+		{currentMajor - 2, task.KindMinor, "next minor"}, // TODO(go.dev/issue/62076): Remove after Go 1.19.13 is out.
 	}
 	if time.Since(majorReleaseTime) < 7*24*time.Hour {
-		releases = append(releases, release{task.KindMajor, currentMajor, "final"})
+		releases = append(releases, release{currentMajor, task.KindMajor, "final"})
 	}
 	for _, r := range releases {
 		wd := wf.New()
@@ -330,7 +333,7 @@ func registerProdReleaseWorkflows(ctx context.Context, h *DefinitionHolder, buil
 
 		securitySummary := wf.Const("")
 		securityFixes := wf.Slice[string]()
-		if r.kind == task.KindCurrentMinor || r.kind == task.KindPrevMinor {
+		if r.kind == task.KindMinor {
 			securitySummary = wf.Param(wd, securitySummaryParameter)
 			securityFixes = wf.Param(wd, securityFixesParameter)
 		}
@@ -351,7 +354,7 @@ func registerProdReleaseWorkflows(ctx context.Context, h *DefinitionHolder, buil
 func registerBuildTestSignOnlyWorkflow(h *DefinitionHolder, version *task.VersionTasks, build *BuildReleaseTasks, major int, kind task.ReleaseKind) {
 	wd := wf.New()
 
-	nextVersion := wf.Task1(wd, "Get next version", version.GetNextVersion, wf.Const(kind))
+	nextVersion := wf.Task2(wd, "Get next version", version.GetNextVersion, wf.Const(major), wf.Const(kind))
 	branch := fmt.Sprintf("release-branch.go1.%d", major)
 	if kind == task.KindBeta {
 		branch = "master"
@@ -373,12 +376,12 @@ func createMinorReleaseWorkflow(build *BuildReleaseTasks, milestone *task.Milest
 	wd := wf.New()
 
 	coordinators := wf.Param(wd, releaseCoordinators)
-	currPublished := addSingleReleaseWorkflow(build, milestone, version, wd.Sub(fmt.Sprintf("Go 1.%d", currentMajor)), currentMajor, task.KindCurrentMinor, coordinators)
-	prevPublished := addSingleReleaseWorkflow(build, milestone, version, wd.Sub(fmt.Sprintf("Go 1.%d", prevMajor)), prevMajor, task.KindPrevMinor, coordinators)
+	currPublished := addSingleReleaseWorkflow(build, milestone, version, wd.Sub(fmt.Sprintf("Go 1.%d", currentMajor)), currentMajor, task.KindMinor, coordinators)
+	prevPublished := addSingleReleaseWorkflow(build, milestone, version, wd.Sub(fmt.Sprintf("Go 1.%d", prevMajor)), prevMajor, task.KindMinor, coordinators)
 
 	securitySummary := wf.Param(wd, securitySummaryParameter)
 	securityFixes := wf.Param(wd, securityFixesParameter)
-	addCommTasks(wd, build, comm, task.KindCurrentMinor, wf.Slice(currPublished, prevPublished), securitySummary, securityFixes, coordinators)
+	addCommTasks(wd, build, comm, task.KindMinor, wf.Slice(currPublished, prevPublished), securitySummary, securityFixes, coordinators)
 
 	return wd, nil
 }
@@ -420,7 +423,7 @@ func addSingleReleaseWorkflow(
 	startingHead := wf.Task1(wd, "Read starting branch head", version.ReadBranchHead, branchVal)
 
 	// Select version, check milestones.
-	nextVersion := wf.Task1(wd, "Get next version", version.GetNextVersion, kindVal)
+	nextVersion := wf.Task2(wd, "Get next version", version.GetNextVersion, wf.Const(major), kindVal)
 	timestamp := wf.Task0(wd, "Timestamp release", now)
 	versionFile := wf.Task3(wd, "Generate VERSION file", version.GenerateVersionFile, distpackVal, nextVersion, timestamp)
 	wf.Output(wd, "VERSION file", versionFile)

internal/task/announce.go

@@ -344,7 +344,7 @@ func announcementMail(data any) (MailContent, error) {
 			name = "announce-rc.md"
 		case KindMajor:
 			name = "announce-major.md"
-		case KindCurrentMinor, KindPrevMinor:
+		case KindMinor:
 			name = "announce-minor.md"
 		default:
 			return MailContent{}, fmt.Errorf("unknown release kind: %v", r.Kind)

internal/task/announce_test.go

@@ -24,7 +24,7 @@ import (
 func TestAnnounceReleaseShortContext(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
-	_, err := (AnnounceMailTasks{}).AnnounceRelease(&workflow.TaskContext{Context: ctx}, KindCurrentMinor, []Published{{Version: "go1.18.1"}, {Version: "go1.17.8"}}, nil, nil)
+	_, err := (AnnounceMailTasks{}).AnnounceRelease(&workflow.TaskContext{Context: ctx}, KindMinor, []Published{{Version: "go1.18.1"}, {Version: "go1.17.8"}}, nil, nil)
 	if err == nil {
 		t.Errorf("want non-nil error")
 	} else if !strings.HasPrefix(err.Error(), "insufficient time") {
@@ -41,7 +41,7 @@ func TestAnnouncementMail(t *testing.T) {
 		{
 			name: "announce-minor",
 			in: releaseAnnouncement{
-				Kind:             KindCurrentMinor,
+				Kind:             KindMinor,
 				Version:          "go1.18.1",
 				SecondaryVersion: "go1.17.9",
 				Names:            []string{"Alice", "Bob", "Charlie"},
@@ -51,7 +51,7 @@ func TestAnnouncementMail(t *testing.T) {
 		{
 			name: "announce-minor-with-security",
 			in: releaseAnnouncement{
-				Kind:             KindCurrentMinor,
+				Kind:             KindMinor,
 				Version:          "go1.18.1",
 				SecondaryVersion: "go1.17.9",
 				Security: []string{
@@ -85,7 +85,7 @@ This is CVE-2022-27536 and https://go.dev/issue/51759.`,
 		{
 			name: "announce-minor-solo",
 			in: releaseAnnouncement{
-				Kind:     KindCurrentMinor,
+				Kind:     KindMinor,
 				Version:  "go1.11.1",
 				Security: []string{"abc: security fix 1", "xyz: security fix 2"},
 				Names:    []string{"Alice"},
@@ -203,7 +203,7 @@ func TestAnnounceRelease(t *testing.T) {
 	}{
 		{
 			name:         "minor",
-			kind:         KindCurrentMinor,
+			kind:         KindMinor,
 			published:    []Published{{Version: "go1.18.1"}, {Version: "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"},

internal/task/dlcl.go

@@ -62,7 +62,7 @@ func (t *VersionTasks) MailDLCL(ctx *workflow.TaskContext, major int, kind Relea
 }
 
 func docLink(major int, kind ReleaseKind, ver string) string {
-	if kind == KindCurrentMinor || kind == KindPrevMinor {
+	if kind == KindMinor {
 		return fmt.Sprintf("https://go.dev/doc/devel/release#%v", ver)
 	}
 

internal/task/dlcl_test.go

@@ -26,7 +26,7 @@ func TestMailDLCL(t *testing.T) {
 	}{
 		{
 			name:    "minor",
-			kind:    KindCurrentMinor,
+			kind:    KindMinor,
 			major:   17,
 			version: "go1.17.1",
 			wantLog: `file "go1.17.1/main.go" (command "golang.org/dl/go1.17.1"):

internal/task/milestones.go

@@ -32,10 +32,26 @@ const (
 	KindBeta
 	KindRC
 	KindMajor
-	KindCurrentMinor
-	KindPrevMinor
+	KindMinor
 )
 
+func (k ReleaseKind) GoString() string {
+	switch k {
+	case KindUnknown:
+		return "KindUnknown"
+	case KindBeta:
+		return "KindBeta"
+	case KindRC:
+		return "KindRC"
+	case KindMajor:
+		return "KindMajor"
+	case KindMinor:
+		return "KindMinor"
+	default:
+		return fmt.Sprintf("ReleaseKind(%d)", k)
+	}
+}
+
 type ReleaseMilestones struct {
 	// Current is the GitHub milestone number for the current Go release.
 	// For example, 279 for the "Go1.21" milestone (https://github.com/golang/go/milestone/279).
@@ -148,7 +164,7 @@ func (m *MilestoneTasks) PushIssues(ctx *wf.TaskContext, milestones ReleaseMiles
 			removeLabel("okay-after-beta1")
 		} else if kind == KindRC && strings.HasSuffix(version, "rc1") {
 			removeLabel("okay-after-rc1")
-		} else if kind == KindMajor || kind == KindCurrentMinor || kind == KindPrevMinor {
+		} else if kind == KindMajor || kind == KindMinor {
 			newMilestone = &milestones.Next
 			actions = append(actions, fmt.Sprintf("pushed to milestone %d", milestones.Next))
 		}
@@ -165,7 +181,7 @@ func (m *MilestoneTasks) PushIssues(ctx *wf.TaskContext, milestones ReleaseMiles
 		}
 		ctx.Printf("Updated issue %d: %s.", issueNumber, strings.Join(actions, ", "))
 	}
-	if kind == KindMajor || kind == KindCurrentMinor || kind == KindPrevMinor {
+	if kind == KindMajor || kind == KindMinor {
 		_, _, err := m.Client.EditMilestone(ctx, m.RepoOwner, m.RepoName, milestones.Current, &github.Milestone{
 			State: github.String("closed"),
 		})

internal/task/tweet.go

@@ -183,7 +183,7 @@ func tweetText(r releaseTweet, rnd *rand.Rand) (string, error) {
 		name = "rc"
 	case KindMajor:
 		name = "major"
-	case KindCurrentMinor, KindPrevMinor:
+	case KindMinor:
 		name = "minor"
 	default:
 		return "", fmt.Errorf("unknown release kind: %v", r.Kind)

internal/task/tweet_test.go

@@ -36,7 +36,7 @@ func TestTweetRelease(t *testing.T) {
 	}{
 		{
 			name: "minor",
-			kind: KindCurrentMinor,
+			kind: KindMinor,
 			published: []Published{
 				{Version: "go1.17.1", Files: []WebsiteFile{{
 					OS: "linux", Arch: "arm64",
@@ -70,7 +70,7 @@ go version go1.17.1 linux/arm64` + "\n",
 		},
 		{
 			name: "minor-solo",
-			kind: KindCurrentMinor,
+			kind: KindMinor,
 			published: []Published{{Version: "go1.11.1", Files: []WebsiteFile{{
 				OS: "darwin", Arch: "amd64",
 				Filename: "go1.11.1.darwin-amd64.tar.gz", Size: 124181190, Kind: "archive"}},

internal/task/version.go

@@ -66,12 +66,12 @@ func (t *VersionTasks) tagInfo(ctx context.Context) (tags map[string]bool, curre
 	return nil, 0, "", fmt.Errorf("couldn't find the most recently released major version out of %d tags", len(tagList))
 }
 
-// GetNextVersions returns the next for each of the given types of release.
+// GetNextMinorVersions returns the next minor for each of the given major series.
 // It uses the same format as Go tags (for example, "go1.23.4").
-func (t *VersionTasks) GetNextVersions(ctx context.Context, kinds []ReleaseKind) ([]string, error) {
+func (t *VersionTasks) GetNextMinorVersions(ctx context.Context, majors []int) ([]string, error) {
 	var next []string
-	for _, k := range kinds {
-		n, err := t.GetNextVersion(ctx, k)
+	for _, major := range majors {
+		n, err := t.GetNextVersion(ctx, major, KindMinor)
 		if err != nil {
 			return nil, err
 		}
@@ -80,10 +80,10 @@ func (t *VersionTasks) GetNextVersions(ctx context.Context, kinds []ReleaseKind)
 	return next, nil
 }
 
-// GetNextVersion returns the next for the given type of release.
+// GetNextVersion returns the next for the given major series and kind of release.
 // It uses the same format as Go tags (for example, "go1.23.4").
-func (t *VersionTasks) GetNextVersion(ctx context.Context, kind ReleaseKind) (string, error) {
-	tags, currentMajor, _, err := t.tagInfo(ctx)
+func (t *VersionTasks) GetNextVersion(ctx context.Context, major int, kind ReleaseKind) (string, error) {
+	tags, _, _, err := t.tagInfo(ctx)
 	if err != nil {
 		return "", err
 	}
@@ -99,18 +99,17 @@ func (t *VersionTasks) GetNextVersion(ctx context.Context, kind ReleaseKind) (st
 		}
 	}
 	switch kind {
-	case KindCurrentMinor:
-		return findUnused(fmt.Sprintf("go1.%d.1", currentMajor))
-	case KindPrevMinor:
-		return findUnused(fmt.Sprintf("go1.%d.1", currentMajor-1))
+	case KindMinor:
+		return findUnused(fmt.Sprintf("go1.%d.1", major))
 	case KindBeta:
-		return findUnused(fmt.Sprintf("go1.%dbeta1", currentMajor+1))
+		return findUnused(fmt.Sprintf("go1.%dbeta1", major))
 	case KindRC:
-		return findUnused(fmt.Sprintf("go1.%drc1", currentMajor+1))
+		return findUnused(fmt.Sprintf("go1.%drc1", major))
 	case KindMajor:
-		return fmt.Sprintf("go1.%d.0", currentMajor+1), nil
+		return fmt.Sprintf("go1.%d.0", major), nil
+	default:
+		return "", fmt.Errorf("unknown release kind %v", kind)
 	}
-	return "", fmt.Errorf("unknown release kind %v", kind)
 }
 
 // GetDevelVersion returns the current major Go 1.x version in development.