mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 11:01:25 +01:00
Reverts #1126, #1125, #1124, #1123 and #1122. `go.mod` keeps the Go 1.26 line with toolchain `go1.26.9` (instead of the original `go1.26.6`) so the security fix from #1131 isn't lost. reopens #69 reopens #141 reopens #162 reopens #172 reopens #197 reopens #232 reopens #240 reopens #246 reopens #323 reopens #325 reopens #326 reopens #328 reopens #344 reopens #351 reopens #373 reopens #403 reopens #406 reopens #417 reopens #430 reopens #457 reopens #480 reopens #482 reopens #489 reopens #490 reopens #498 reopens #500 reopens #504 reopens #510 reopens #516 reopens #523 reopens #556 reopens #560 reopens #569 reopens #571 reopens #602 reopens #632 reopens #633 reopens #643 reopens #666 reopens #670 reopens #672 reopens #677 reopens #683 reopens #697 reopens #726 reopens #737 reopens #770 reopens #779 reopens #804 reopens #817 reopens #831 reopens #833 reopens #834 reopens #908 reopens #966 reopens #1023 reopens #1029 reopens #1032 reopens #1050 reopens #1052 reopens #1069 reopens #1073 reopens #1087 reopens #1091 reopens #1094 reopens #1110 reopens #1115 reopens #1116 reopens #1118 Reviewed-on: https://gitea.com/gitea/tea/pulls/1146 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
55 lines
1.7 KiB
Go
55 lines
1.7 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package task
|
|
|
|
import (
|
|
stdctx "context"
|
|
"fmt"
|
|
|
|
gitea "gitea.dev/sdk"
|
|
|
|
"gitea.dev/tea/modules/config"
|
|
)
|
|
|
|
// PullMerge merges a PR
|
|
func PullMerge(requestCtx stdctx.Context, login *config.Login, repoOwner, repoName string, index int64, opt gitea.MergePullRequestOption) error {
|
|
client := login.Client()
|
|
success, _, err := client.PullRequests.MergePullRequest(requestCtx, repoOwner, repoName, index, opt)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if success {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("failed to merge PR #%d: %s", index,
|
|
mergeFailureReason(requestCtx, client, repoOwner, repoName, index))
|
|
}
|
|
|
|
// mergeFailureReason returns why merging was refused. The SDK reports refusal as
|
|
// success=false and discards Gitea's explanatory body, so the reason has to be
|
|
// re-derived from the PR. Costs one API call, on the failure path only.
|
|
func mergeFailureReason(requestCtx stdctx.Context, client *gitea.Client, repoOwner, repoName string, index int64) string {
|
|
// Fallback naming the conditions tea cannot observe, used when the PR looks
|
|
// mergeable but the merge was refused anyway.
|
|
const refused = "the server refused the merge; check required status checks, requested reviews, or branch protection rules"
|
|
|
|
pr, _, err := client.PullRequests.GetPullRequest(requestCtx, repoOwner, repoName, index)
|
|
if err != nil || pr == nil {
|
|
return refused
|
|
}
|
|
|
|
switch {
|
|
case pr.HasMerged:
|
|
return "it has already been merged"
|
|
case pr.State == gitea.StateClosed:
|
|
return "it is closed"
|
|
case pr.Draft:
|
|
return "it is a draft; mark it ready for review first"
|
|
case !pr.Mergeable:
|
|
return "it has conflicting files or is otherwise not mergeable"
|
|
default:
|
|
return refused
|
|
}
|
|
}
|