fix: add option to accept mr when pipeline succeed

gopaytech · Sep 29, 2022 · 407ef67 · 407ef67
1 parent 42cfe20
commit 407ef67
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/pkg/gitlab/gitlab_mock/merge_request.go b/pkg/gitlab/gitlab_mock/merge_request.go
diff --git a/pkg/gitlab/merge_request.go b/pkg/gitlab/merge_request.go
@@ -26,7 +26,7 @@ type MergeRequest interface {
 	CreateToMaster(projectId NameOrId, sourceBranch string, title string) (*gl.MergeRequest, error)
 	Approve(projectId NameOrId, mergeRequestID int) error
 	Close(projectId NameOrId, mergeRequestID int) error
-	Accept(projectId NameOrId, mergeRequestID int, removeBranch bool) (*gl.MergeRequest, error)
+	Accept(projectId NameOrId, mergeRequestID int, removeBranch bool, whenPipelinePassed bool) (*gl.MergeRequest, error)
 }
 
 type mergeRequest struct {
@@ -94,9 +94,10 @@ func (e *mergeRequest) Close(projectId NameOrId, mergeRequestID int) error {
 	return err
 }
 
-func (e *mergeRequest) Accept(projectId NameOrId, mergeRequestID int, removeBranch bool) (*gl.MergeRequest, error) {
+func (e *mergeRequest) Accept(projectId NameOrId, mergeRequestID int, removeBranch bool, whenPipelinePassed bool) (*gl.MergeRequest, error) {
 	mr, _, err := e.client.MergeRequests.AcceptMergeRequest(projectId.Get(), mergeRequestID, &gl.AcceptMergeRequestOptions{
-		ShouldRemoveSourceBranch: gl.Bool(removeBranch),
+		ShouldRemoveSourceBranch:  gl.Bool(removeBranch),
+		MergeWhenPipelineSucceeds: gl.Bool(whenPipelinePassed),
 	})
 	if err != nil {
 		return nil, err