internal/relui, internal/task: clean up after the 1.19 off-cycle release

Fixes golang/go#62076. Change-Id: I682edd67d5274f5d2b7da64d408319b89c6cfeec Reviewed-on: https://go-review.googlesource.com/c/build/+/526216 Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Heschi Kreinick <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Cherry Mui <[email protected]>
golang · Sep 6, 2023 · 27ac909 · 27ac909
1 parent 245708a
commit 27ac909
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/internal/relui/workflows.go b/internal/relui/workflows.go
@@ -319,7 +319,6 @@ func registerProdReleaseWorkflows(ctx context.Context, h *DefinitionHolder, buil
  {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{currentMajor, task.KindMajor, "final"})

diff --git a/internal/task/version.go b/internal/task/version.go
@@ -184,11 +184,6 @@ func (t *VersionTasks) GenerateVersionFile(_ *workflow.TaskContext, distpack boo
 
 // CreateAutoSubmitVersionCL mails an auto-submit change to update VERSION file on branch.
 func (t *VersionTasks) CreateAutoSubmitVersionCL(ctx *workflow.TaskContext, branch, version string, reviewers []string, versionFile string) (string, error) {
- // TODO(go.dev/issue/62076): Remove after Go 1.19.13 is out.
- if branch == "release-branch.go1.19" && version == "go1.19.13" {
- return "go~526138", nil // Use the CL it already created (but failed to add votes/reviewers to).
- }
-
  return t.Gerrit.CreateAutoSubmitChange(ctx, gerrit.ChangeInput{
  Project: t.GoProject,
  Branch: branch,

diff --git a/internal/task/version_test.go b/internal/task/version_test.go
@@ -46,7 +46,6 @@ func TestGetNextVersionLive(t *testing.T) {
  {currentMajor + 1, KindBeta}, // Next beta.
  {currentMajor, KindMinor}, // Current minor only.
  {currentMajor - 1, KindMinor}, // Previous minor only.
- {currentMajor - 2, KindMinor}, // TODO(go.dev/issue/62076): Remove after Go 1.19.13 is out.
  } {
  v, err := tasks.GetNextVersion(ctx, tc.major, tc.kind)
  if err != nil {