36 lines
1.0 KiB
Go
36 lines
1.0 KiB
Go
package forge
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
)
|
|
|
|
// PRStateMerged is the state PRState reports for a merged pull request.
|
|
const PRStateMerged = "merged"
|
|
|
|
// PRStateClosed is the state PRState reports for a pull request closed
|
|
// without merging.
|
|
const PRStateClosed = "closed"
|
|
|
|
// ErrPRClosed reports a merge refused because the pull request was closed
|
|
// without merging.
|
|
var ErrPRClosed = errors.New("pull request closed without merging")
|
|
|
|
// MergeOrConfirm merges a pull request and treats a refusal as success when
|
|
// the forge reports the PR already merged: a merge outside Archie, or one that
|
|
// raced the reconciler, leaves nothing to refuse.
|
|
func MergeOrConfirm(ctx context.Context, f Forge, owner, repo string, number int) error {
|
|
mergeErr := f.MergePR(ctx, owner, repo, number)
|
|
if mergeErr == nil {
|
|
return nil
|
|
}
|
|
state, err := f.PRState(ctx, owner, repo, number)
|
|
if err == nil && state == PRStateMerged {
|
|
return nil
|
|
}
|
|
if err == nil && state == PRStateClosed {
|
|
return errors.Join(ErrPRClosed, mergeErr)
|
|
}
|
|
return errors.Join(mergeErr, err)
|
|
}
|