Use pull request directly when pull request review approved

lunny · lunny · commit a5f039777ab1 · 2024-05-21T21:39:24.000+08:00
diff --git a/services/automerge/notify.go b/services/automerge/notify.go
@@ -26,9 +26,7 @@ func NewNotifier() notify_service.Notifier {
 func (n *automergeNotifier) PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
 	// as a missing / blocking reviews could have blocked a pending automerge let's recheck
 	if review.Type == issues_model.ReviewTypeApprove {
-		if err := StartPRCheckAndAutoMergeBySHA(ctx, review.CommitID, pr.BaseRepo); err != nil {
-			log.Error("StartPullRequestAutoMergeCheckBySHA: %v", err)
-		}
+		StartPRCheckAndAutoMerge(ctx, pr)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ func NewNotifier() notify_service.Notifier {`
`26`	`26`	`func (n automergeNotifier) PullRequestReview(ctx context.Context, pr issues_model.PullRequest, review issues_model.Review, comment issues_model.Comment, mentions []*user_model.User) {`
`27`	`27`	`// as a missing / blocking reviews could have blocked a pending automerge let's recheck`
`28`	`28`	`if review.Type == issues_model.ReviewTypeApprove {`
`29`		`- if err := StartPRCheckAndAutoMergeBySHA(ctx, review.CommitID, pr.BaseRepo); err != nil {`
`30`		`- log.Error("StartPullRequestAutoMergeCheckBySHA: %v", err)`
`31`		`- }`
	`29`	`+ StartPRCheckAndAutoMerge(ctx, pr)`
`32`	`30`	`}`
`33`	`31`	`}`
`34`	`32`