Automerge does not work

[EndrII]

Description

I added next rules for merging PR

• All statuses of commit must be successful before merge
• PR must have one approve review

Gitea Version

1.19.2

Can you reproduce the bug on the Gitea demo site?

I don't know (I can't check it)

Log Gist

No response

Screenshots

Git Version

git version 2.25.1

Operating System

ubuntu 20.04 (Linux beloved-pipefish 5.4.0-125-generic #141-Ubuntu SMP Wed Aug 10 13:42:03 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux)

How are you running Gitea?

I run Gitea from prepared binary files

Database

SQLite

[nekrondev]

The auto-merge isn't even working on a much simpler workflow by only requesting approval.
I created a demo here https://try.gitea.io/merge_user1/automerge_problem/pulls/1.

merge_user1's repository got branched by merge_user2 (both are repository admins, merge_user2 is a collaborator). Now merge_user2 wants to PR his bugfix. The main branch is protected and needs one approval. merge_user2 submitted his PR with auto merge enabled, i.e. after approval of merge_user1 his change should be auto-merged into main.

Now merge_user1 approved his PR but the commit is not auto-merged into main branch like requested by PR owner.

[nekrondev]

I did some research and it looks like currently automatic merging can only be triggered via API call (GT Actions state when executed successfully aren't counting here either; approval will not trigger this, too).

gitea/routers/api/v1/repo/status.go

Line 20 in 0533187

func NewCommitStatus(ctx *context.APIContext) {

That API function will call the CreateCommitStatus() function that will trigger the automerge checks ...

gitea/services/repository/files/commit.go

Line 22 in 79995a8

func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creator *user_model.User, sha string, status *git_model.CommitStatus) error {

... that will eventually end in adding a new merge message into the pr_automerge_queue.

gitea/services/automerge/automerge.go

Line 98 in 79995a8

func MergeScheduledPullRequest(ctx context.Context, sha string, repo *repo_model.Repository) error {

In the end there are a few missing bits and pieces for actions and approvals that needs to be added.
In your case it's unclear to me why buildbot commit states didn't trigger the automerge (buildbot should use the commit state API which triggers auto merging).

[EndrII]

@nekrondev this is looks as a bug, because you can enable branch protection and block merge without any review. But any users can enable automerge and merge it after successful tests ...
So anyway, the automerge must work as in GitHub. But not like now

[nekrondev]

I did a quick test with

• auto-merge enabled and
• one approval missing

If I send the API request to commit a successful check the auto-merge is not executed which is fine (the PR still needs to be reviewed).

However if I submit my PR review approval then without any additional calls to the API endpoint the change wouldn't be merged automatically. I think this is the same behavior for Gitea Actions that needs to call the proper automerge function internally after a successful check had been returned from the runner.

@lunny I guess that

gitea/services/pull/review.go

Line 267 in 221b90d

func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repository, issue *issues_model.Issue, reviewType issues_model.ReviewType, content, commitID string, attachmentUUIDs []string) (*issues_model.Review, *issues_model.Comment, error) {

is missing a call to MergeScheduledPullRequest() function at module automerge when an approval had been granted and origin PR owner requested an automerge.

[lunny]

I think the automerge logic should have some refactor. Maybe Gitea could learn some from GH.

[JoaoVictorLouro]

Same issue on GitTea 1.21

Running on:
Gitea Version
1.21.0 built with GNU Make 4.4.1, go1.21.4 : bindata, timetzdata, sqlite, sqlite_unlock_notify
Database:
mysql (mariadb) 10.6.9
Act Runner:
0.2.6

All through docker (via docker-compose)

Any chance we can fix this? Any ideas of where to start looking?

[henrygoodman]

I really hope re-invigorating the auto-merge will also allow us to expose some endpoint to check PR mergeability (from more than just a git perspective, considering reviews/checks/correct merge base etc).