Merge pull request #57 from Cian911/issues-56/seg-fault

BUG: Fix bug in close operation
Cian911 · Oct 2, 2022 · c68e6e0 · c68e6e0
2 parents 4330275 + b07307a
commit c68e6e0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/pkg/cli/gomerge/gomerge.go b/pkg/cli/gomerge/gomerge.go
@@ -20,6 +20,7 @@ func New() (c *cobra.Command) {
 	c.PersistentFlags().StringP("merge-method", "m", "", "Pass an optional merge method for the pull request (merge [default], squash, rebase).")
 	c.PersistentFlags().BoolP("skip", "s", false, "Pass an optional flag to skip a pull request and continue if one or more are not mergable.")
 	c.PersistentFlags().BoolP("close", "", false, "Pass an optional argument to close a pull request.")
+	c.PersistentFlags().IntP("delay", "d", 6, "Set the value of delay, which will determine how long to wait between mergeing pull requests. Default is (6) seconds.")
 	c.PersistentFlags().StringP("enterprise-base-url", "e", "", "For Github Enterprise users, you can pass your enterprise base. Format: http(s)://[hostname]/")
 
 	c.MarkFlagRequired("token")
@@ -30,6 +31,7 @@ func New() (c *cobra.Command) {
 	viper.BindPFlag("approve", c.PersistentFlags().Lookup("approve"))
 	viper.BindPFlag("merge-method", c.PersistentFlags().Lookup("merge-method"))
 	viper.BindPFlag("skip", c.PersistentFlags().Lookup("skip"))
+	viper.BindPFlag("delay", c.PersistentFlags().Lookup("delay"))
 	viper.BindPFlag("close", c.PersistentFlags().Lookup("close"))
 	viper.BindPFlag("enterprise-base-url", c.PersistentFlags().Lookup("enterprise-base-url"))
 

diff --git a/pkg/cli/list/list.go b/pkg/cli/list/list.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/cian911/go-merge/pkg/gitclient"
@@ -44,6 +45,7 @@ func NewCommand() (c *cobra.Command) {
 			skip := viper.GetBool("skip")
 			closePr := viper.GetBool("close")
 			enterpriseUrl := viper.GetString("enterprise-base-url")
+			delay := viper.GetInt("delay")
 
 			if len(configFile) > 0 {
 				utils.ReadConfigFile(configFile)
@@ -98,6 +100,9 @@ func NewCommand() (c *cobra.Command) {
 						gitclient.ClosePullRequest(ghClient, ctx, org, repo, prId, pullRequestsArray[x])
 					} else {
 						gitclient.MergePullRequest(ghClient, ctx, org, p[1], prId, mergeMethod, skip)
+
+						// delay between merges to allow other active PRs to get synced
+						time.Sleep(time.Duration(delay) * time.Second)
 					}
 				}
 			} else {
@@ -123,6 +128,9 @@ func NewCommand() (c *cobra.Command) {
 						gitclient.ClosePullRequest(ghClient, ctx, org, repo, prId, pullRequests[x])
 					} else {
 						gitclient.MergePullRequest(ghClient, ctx, org, repo, prId, mergeMethod, skip)
+
+						// delay between merges to allow other active PRs to get synced
+						time.Sleep(time.Duration(delay) * time.Second)
 					}
 				}
 			}

diff --git a/pkg/gitclient/client.go b/pkg/gitclient/client.go
@@ -55,10 +55,10 @@ func ApprovePullRequest(ghClient *github.Client, ctx context.Context, org, repo
 
 func MergePullRequest(ghClient *github.Client, ctx context.Context, org, repo string, prId int, mergeMethod string, skip bool) {
 	result, _, err := ghClient.PullRequests.Merge(ctx, org, repo, prId, defaultCommitMsg(), &github.PullRequestOptions{MergeMethod: mergeMethod})
-	if err != nil && !skip {
-		log.Fatal(err)
-	} else {
+	if err != nil {
 		log.Printf("Could not merge PR #%d, skipping: %v\n", prId, err)
+
+		return
 	}
 
 	fmt.Println(fmt.Sprintf("PR #%d: %v.", prId, *result.Message))
@@ -70,8 +70,9 @@ func ClosePullRequest(ghClient *github.Client, ctx context.Context, org, repo st
 	result, _, err := ghClient.PullRequests.Edit(ctx, org, repo, prId, prRef)
 	if err != nil {
 		log.Printf("Could not close PR #%d - %v", prId, err)
+	} else {
+		fmt.Println(fmt.Sprintf("PR #%d: %v.", prId, *result.State))
 	}
-	fmt.Println(fmt.Sprintf("PR #%d: %v.", prId, *result.State))
 }
 
 func defaultCommitMsg() string {

diff --git a/pkg/utils/config_test.yaml b/pkg/utils/config_test.yaml
@@ -1,5 +1,5 @@
 organization: Cian911
 token: 1234test@gh*token
 repositories:
-- pr-test
+- gomerge-test
 - syncwave