Merge release Pull Request

go/interactive/main_menu.go

@@ -62,6 +62,7 @@ func MainScreen(ctx context.Context) {
 		release.DockerImagesItem(ctx),
 		release.CloseMilestoneItem(ctx),
 	)
+	releaseMenu.Sequential = true
 
 	postReleaseMenu := ui.NewMenu(
 		ctx,

go/interactive/release/merge_release_pr.go

@@ -22,6 +22,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"vitess.io/vitess-releaser/go/interactive/ui"
 	"vitess.io/vitess-releaser/go/releaser"
+	"vitess.io/vitess-releaser/go/releaser/release"
 	"vitess.io/vitess-releaser/go/releaser/steps"
 )
 
@@ -31,22 +32,45 @@ func MergeReleasePRItem(ctx context.Context) *ui.MenuItem {
 	if state.Issue.MergeReleasePR.Done {
 		act = nil
 	}
+
+	info := "Run this step once the Release Pull Request was created."
+	if state.Issue.CreateReleasePR.URL != "" {
+		info = state.Issue.CreateReleasePR.URL
+	}
+
 	return &ui.MenuItem{
 		State:  state,
 		Name:   steps.MergeReleasePR,
 		Act:    act,
 		Update: mergeReleasePRUpdate,
-		Info:   state.Issue.MergeReleasePR.URL,
+		Info:   info,
 		IsDone: state.Issue.MergeReleasePR.Done,
 	}
 }
 
 type mergeReleasePRUrl string
 
 func mergeReleasePRUpdate(mi *ui.MenuItem, msg tea.Msg) (*ui.MenuItem, tea.Cmd) {
+	url, ok := msg.(mergeReleasePRUrl)
+	if !ok {
+		return mi, nil
+	}
+
+	if url != "" {
+		mi.Info = string(url)
+	}
+	mi.IsDone = mi.State.Issue.MergeReleasePR.Done
 	return mi, nil
 }
 
 func mergeReleasePRAct(mi *ui.MenuItem) (*ui.MenuItem, tea.Cmd) {
-	return mi, nil
+	// If the Release PR was not found in the Release Issue, do nothing
+	if mi.State.Issue.CreateReleasePR.URL == "" {
+		return mi, nil
+	}
+
+	pl, m := release.MergeReleasePR(mi.State)
+	return mi, tea.Batch(func() tea.Msg {
+		return mergeReleasePRUrl(m())
+	}, ui.PushDialog(ui.NewProgressDialog("Merge Release Pull Request", pl)))
 }

go/interactive/ui/menu.go

@@ -30,12 +30,13 @@ import (
 
 type (
 	Menu struct {
-		state   *releaser.State
-		Items   []*MenuItem
-		title   string
-		idx     int
-		columns []string
-		width   int
+		state      *releaser.State
+		Items      []*MenuItem
+		title      string
+		idx        int
+		columns    []string
+		width      int
+		Sequential bool
 	}
 
 	MenuItem struct {
@@ -140,7 +141,7 @@ func (m *Menu) At(row, cell int) string {
 	switch {
 	case m.idx != row:
 		prefix = "   " // this is not the line we are standing on
-	case item.isActBlocked():
+	case item.isActBlocked(m.Sequential):
 		prefix = "\U0001f512 " // we are standing on this line, but it has no action
 	default:
 		prefix = "\U0001f449 "
@@ -193,7 +194,7 @@ func (m *Menu) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 		case "enter":
 			selected := m.Items[m.idx]
-			if selected.isActBlocked() {
+			if selected.isActBlocked(m.Sequential) {
 				return m, nil
 			}
 			var cmd tea.Cmd
@@ -217,8 +218,23 @@ func (m *Menu) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, nil
 }
 
-func (mi *MenuItem) isActBlocked() bool {
-	return mi.Act == nil
+func (mi *MenuItem) isActBlocked(sequential bool) bool {
+	if mi.Act == nil {
+		return true
+	}
+	if !sequential {
+		return false
+	}
+
+	currMenuItem := mi.previous
+	for currMenuItem != nil && (currMenuItem.Name == "" || currMenuItem.DontCountInProgress) {
+		if currMenuItem.previous != nil {
+			currMenuItem = currMenuItem.previous
+		} else {
+			break
+		}
+	}
+	return currMenuItem != nil && !currMenuItem.IsDone
 }
 
 func (m *Menu) View() string {

go/releaser/release/merge_pr.go

@@ -0,0 +1,63 @@
+/*
+Copyright 2023 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package release
+
+import (
+	"log"
+	"strconv"
+	"strings"
+	"time"
+
+	"vitess.io/vitess-releaser/go/releaser"
+	"vitess.io/vitess-releaser/go/releaser/github"
+	"vitess.io/vitess-releaser/go/releaser/logging"
+)
+
+func MergeReleasePR(state *releaser.State) (*logging.ProgressLogging, func() string) {
+	pl := &logging.ProgressLogging{
+		TotalSteps: 5,
+	}
+
+	return pl, func() string {
+		pl.NewStepf("Resolve Release Pull Request URL")
+		url := state.Issue.CreateReleasePR.URL
+		nb, err := strconv.Atoi(url[strings.LastIndex(url, "/")+1:])
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		pl.NewStepf("Waiting for %s to be merged", url)
+	outer:
+		for {
+			select {
+			case <-time.After(5 * time.Second):
+				if github.IsPRMerged(state.VitessRepo, nb) {
+					break outer
+				}
+			}
+		}
+		pl.NewStepf("Pull Request has been merged")
+		state.Issue.MergeReleasePR.Done = true
+		state.Issue.MergeReleasePR.URL = url
+		pl.NewStepf("Update Issue %s on GitHub", state.IssueLink)
+		_, fn := state.UploadIssue()
+		issueLink := fn()
+
+		pl.NewStepf("Issue updated, see: %s", issueLink)
+		return url
+	}
+}