Skip to content

Add MergeMethod option #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add MergeMethod option #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/commit/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type CommitOptions struct {
RetryBackoff time.Duration
PullRequestSourceBranchName string
PullRequestBody string
MergeMethod string
}

func CreateCommit(ctx context.Context, client *github.Client, options *CommitOptions) error {
Expand Down Expand Up @@ -133,8 +134,12 @@ func CreateCommit(ctx context.Context, client *github.Client, options *CommitOpt
return err
}

prOpts := &github.PullRequestOptions{
MergeMethod: options.MergeMethod,
}

for retryCount := 1; retryCount <= options.MaxRetries; retryCount++ {
_, res, err := client.PullRequests.Merge(ctx, options.RepoOwner, options.RepoName, pr.GetNumber(), commit.GetMessage(), nil)
_, res, err := client.PullRequests.Merge(ctx, options.RepoOwner, options.RepoName, pr.GetNumber(), commit.GetMessage(), prOpts)
if err == nil {
// PR was merged, so we can attempt to remove our working branch.
// This isn't a critical operation, hence we do not error out if we fail to do so.
Expand Down