mirror of
https://codeberg.org/forgejo/forgejo
synced 2025-10-18 23:10:42 +02:00
cfea452aa9
**Backport: https://codeberg.org/forgejo/forgejo/pulls/8189** This is a clean cherry-pick codewise. There was a minor conflict to resolve in the tests: ``` Conflicts: tests/integration/patch_status_test.go the test file did not exist at all in v11 and was added as is with one exception: `ObjectFormat: optional.Some("sha256"),` was commented out. ``` --- Automerge can be ignored when the following race happens: * Conflict check is happening on a repository and `pr.Status = issues_model.PullRequestStatusChecking` for all open pull requests (this happens every time a pull request is merged). * While the conflict check is ongoing, an event (Forgejo Actions being successful for instance) happens and and `StartPRCheckAndAutoMerge*` is called. * Because `pr.CanAutoMerge()` is false, the pull request is not selected and not added to the automerge queue. * When the conflict check completes and `pr.CanAutoMerge()` becomes true, there no longer is a task in the auto merge queue and the auto merge does not happen. This is fixed by adding a task to the auto merge queue when the conflict check for a pull request completes. This is done when the mutx protecting the conflict check task is released to prevent a deadlock when a synchronous queues are used in the following situation: * the conflict check task finds the pull request is mergeable * it schedules the auto merge tasks that finds it must be merged * merging concludes with scheduling a conflict check task Avoid an extra loop where a conflict check task queues an auto merge task that will schedule a conflict check task if the pull request can be merged. The auto merge row is removed from the database before merging. It would otherwise be removed after the merge commit is received via the git hook which happens asynchronously and can lead to a race. StartPRCheckAndAutoMerge is modified to re-use HeadCommitID when available, such as when called after a pull request conflict check. --- A note on tests: they cover the new behavior, i.e. automerge being triggered by a successful conflict check. This is also on the critical paths for every test that involve creating, merging or updating a pull request. - `tests/integration/git_test.go` - `tests/integration/actions_commit_status_test.go` - `tests/integration/api_helper_for_declarative_test.go` - `tests/integration/patch_status_test.go` - `tests/integration/pull_merge_test.go` The [missing fixture file](https://codeberg.org/forgejo/forgejo/pulls/8189/files#diff-b86fdd79108b3ba3cb2e56ffcfd1be2a7b32f46c) for the auto merge table can be verified to be necessary simply by removing it an observing that the integration tests fail. The [scheduling of the auto merge task](https://codeberg.org/forgejo/forgejo/pulls/8189/files#diff-9489262e93967f6bb2db41837f37c06f4e70d978) in `testPR` can be verified to be required by moving it in the `testPRProtected` function and observing that the tests hang forever because of the deadlock. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/8189): <!--number 8189 --><!--line 0 --><!--description ZG8gbm90IGlnbm9yZSBhdXRvbWVyZ2Ugd2hpbGUgYSBQUiBpcyBjaGVja2luZyBmb3IgY29uZmxpY3Rz-->do not ignore automerge while a PR is checking for conflicts<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8456 Reviewed-by: Lucas <sclu1034@noreply.codeberg.org> Co-authored-by: Earl Warren <contact@earl-warren.org> Co-committed-by: Earl Warren <contact@earl-warren.org> |
||
|---|---|---|
| .. | ||
| PrivateIssueProjects | ||
| TestActivateUserEmail | ||
| TestGetUnmergedPullRequestsByHeadInfoMax | ||
| TestGetUsedForUser | ||
| TestPackagesGetOrInsertBlob | ||
| TestParseCommitWithSSHSignature | ||
| TestPrivateRepoProjects | ||
| access.yml | ||
| access_token.yml | ||
| action.yml | ||
| action_artifact.yml | ||
| action_run.yml | ||
| action_run_job.yml | ||
| action_runner.yml | ||
| action_runner_token.yml | ||
| action_task.yml | ||
| action_task_output.yml | ||
| attachment.yml | ||
| branch.yml | ||
| collaboration.yml | ||
| comment.yml | ||
| commit_status.yml | ||
| commit_status_index.yml | ||
| deploy_key.yml | ||
| email_address.yml | ||
| external_login_user.yml | ||
| federated_user.yml | ||
| federation_host.yml | ||
| follow.yml | ||
| forgejo_blocked_user.yml | ||
| gpg_key.yml | ||
| gpg_key_import.yml | ||
| hook_task.yml | ||
| issue.yml | ||
| issue_assignees.yml | ||
| issue_index.yml | ||
| issue_label.yml | ||
| issue_user.yml | ||
| issue_watch.yml | ||
| label.yml | ||
| lfs_meta_object.yml | ||
| login_source.yml | ||
| milestone.yml | ||
| mirror.yml | ||
| notice.yml | ||
| notification.yml | ||
| oauth2_application.yml | ||
| oauth2_authorization_code.yml | ||
| oauth2_grant.yml | ||
| org_user.yml | ||
| project.yml | ||
| project_board.yml | ||
| project_issue.yml | ||
| protected_branch.yml | ||
| protected_tag.yml | ||
| public_key.yml | ||
| pull_auto_merge.yml | ||
| pull_request.yml | ||
| push_mirror.yml | ||
| reaction.yml | ||
| release.yml | ||
| renamed_branch.yml | ||
| repo_archiver.yml | ||
| repo_indexer_status.yml | ||
| repo_redirect.yml | ||
| repo_topic.yml | ||
| repo_transfer.yml | ||
| repo_unit.yml | ||
| repository.yml | ||
| review.yml | ||
| secret.yml | ||
| star.yml | ||
| stopwatch.yml | ||
| system_setting.yml | ||
| team.yml | ||
| team_repo.yml | ||
| team_unit.yml | ||
| team_user.yml | ||
| topic.yml | ||
| tracked_time.yml | ||
| two_factor.yml | ||
| user.yml | ||
| user_open_id.yml | ||
| user_redirect.yml | ||
| watch.yml | ||
| webauthn_credential.yml | ||
| webhook.yml | ||