Also run automerge check after pull review by 6543 · Pull Request #25741 · go-gitea/gitea

6543 · 2023-07-07T06:01:36Z

Close #24445
Fix #30658

rombert · 2023-12-20T22:27:46Z

Is this related to #24445 ?

6543 · 2023-12-21T22:28:17Z

most likely - I'll have to create a serous pull, this was more a reminder to let me finish it

lunny · 2023-12-21T22:56:33Z

Automerge feature needs a redesign like Github did.

6543 · 2024-03-04T13:43:57Z

hmm it affects the integration tests ... I need to look if we depend on the broken behavior in our tests or if tests are not isolated enough

lunny · 2024-04-09T08:37:51Z

file conflicted.

yp05327 · 2024-04-24T23:59:29Z

@lunny
Another big problem, Gitea server will freeze for a long time after the following steps:

reproduce:
shut down the runner
user B: create a new branch and PR, and enable auto merge
user A: approve it, then we will wait for the CI
start your runner, let the CI finish, then it should be merged as expected, but no, Gitea server will freeze for a long time.

After the frozen, you will see this:

Not sure what happened, I have no time to look into it.

…ok and add a transaction (#30805) Merging PR may fail because of various problems. The pull request may have a dirty state because there is no transaction when merging a pull request. ref #25741 (comment) This PR moves all database update operations to post-receive handler for merging a pull request and having a database transaction. That means if database operations fail, then the git merging will fail, the git client will get a fail result. There are already many tests for pull request merging, so we don't need to add a new one. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

…ok and add a transaction (go-gitea#30805) Merging PR may fail because of various problems. The pull request may have a dirty state because there is no transaction when merging a pull request. ref go-gitea#25741 (comment) This PR moves all database update operations to post-receive handler for merging a pull request and having a database transaction. That means if database operations fail, then the git merging will fail, the git client will get a fail result. There are already many tests for pull request merging, so we don't need to add a new one. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

lunny · 2024-05-07T08:48:04Z

replaced by #30780

@lunny

…ok and add a transaction (#30805) (#30888) Backport #30805 by @lunny Merging PR may fail because of various problems. The pull request may have a dirty state because there is no transaction when merging a pull request. ref #25741 (comment) This PR moves all database update operations to post-receive handler for merging a pull request and having a database transaction. That means if database operations fail, then the git merging will fail, the git client will get a fail result. There are already many tests for pull request merging, so we don't need to add a new one. Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

…ok and add a transaction (#30805) Merging PR may fail because of various problems. The pull request may have a dirty state because there is no transaction when merging a pull request. ref go-gitea/gitea#25741 (comment) This PR moves all database update operations to post-receive handler for merging a pull request and having a database transaction. That means if database operations fail, then the git merging will fail, the git client will get a fail result. There are already many tests for pull request merging, so we don't need to add a new one. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit ebf0c969403d91ed80745ff5bd7dfbdb08174fc7) Conflicts: modules/private/hook.go routers/private/hook_post_receive.go trivial conflicts because 263a716cb5 * Performance optimization for git push (#30104) was not cherry-picked and because of 998a431 Do not update PRs based on events that happened before they existed

…ok and add a transaction (#30805) Merging PR may fail because of various problems. The pull request may have a dirty state because there is no transaction when merging a pull request. ref go-gitea/gitea#25741 (comment) This PR moves all database update operations to post-receive handler for merging a pull request and having a database transaction. That means if database operations fail, then the git merging will fail, the git client will get a fail result. There are already many tests for pull request merging, so we don't need to add a new one. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit ebf0c969403d91ed80745ff5bd7dfbdb08174fc7) Conflicts: modules/private/hook.go routers/private/hook_post_receive.go trivial conflicts because 263a716cb5 * Performance optimization for git push (#30104) was not cherry-picked and because of 998a431 Do not update PRs based on events that happened before they existed (cherry picked from commit eb792d9) (cherry picked from commit ec3f5f9992d7ff8250c044a4467524d53bd50210)

@6543

…ered (#30780) Replace #25741 Close #24445 Close #30658 Close #20646 ~Depends on #30805~ Since #25741 has been rewritten totally, to make the contribution easier, I will continue the work in this PR. Thanks @6543 --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

@6543

…ered (go-gitea#30780) Replace go-gitea#25741 Close go-gitea#24445 Close go-gitea#30658 Close go-gitea#20646 ~Depends on go-gitea#30805~ Since go-gitea#25741 has been rewritten totally, to make the contribution easier, I will continue the work in this PR. Thanks @6543 --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

@lunny

…ered (#30780) (#31039) Backport #30780 by @lunny Replace #25741 Close #24445 Close #30658 Close #20646 ~Depends on #30805~ Since #25741 has been rewritten totally, to make the contribution easier, I will continue the work in this PR. Thanks @6543 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

6543 added the type/enhancement An improvement of existing functionality label Jul 7, 2023

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 7, 2023

pull-request-size Bot added the size/S label Jul 7, 2023

6543 added this to the 1.22.0 milestone Sep 2, 2023

pull-request-size Bot added size/M and removed size/S labels Mar 2, 2024

github-actions Bot added the modifies/api label Mar 2, 2024

6543 marked this pull request as ready for review March 2, 2024 07:36

6543 changed the title ~~WIP: also run automerge after pull review~~ Also run automerge check after pull review Mar 2, 2024

6543 requested a review from a team March 2, 2024 07:36

6543 added type/bug and removed type/enhancement An improvement of existing functionality labels Mar 2, 2024

wxiaoguang approved these changes Mar 4, 2024

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 4, 2024

github-actions Bot added modifies/translation labels Apr 18, 2024

lunny force-pushed the also_auto-merge_on_review_updates branch from 7445aae to 670e236 Compare April 18, 2024 09:29

lunny added 3 commits April 24, 2024 17:02

Fix bug

acd2a9b

Fix lint

ec2f717

Add transaction for auto merge

db4113e

lunny force-pushed the also_auto-merge_on_review_updates branch from 7435a03 to db4113e Compare April 24, 2024 09:03

pull-request-size Bot added size/L and removed size/XL labels Apr 24, 2024

github-actions Bot removed modifies/translation labels Apr 24, 2024

lunny modified the milestones: 1.22.0, 1.23.0 Apr 28, 2024

This was referenced Apr 30, 2024

Fix automerge will not work because of some events haven't been triggered #30780

Merged

Move database operations of merging a pull request to post receive hook and add a transaction #30805

Merged

GiteaBot mentioned this pull request May 7, 2024

Move database operations of merging a pull request to post receive hook and add a transaction (#30805) #30888

Merged

lunny closed this May 7, 2024

GiteaBot removed this from the 1.23.0 milestone May 7, 2024

GiteaBot mentioned this pull request May 21, 2024

Fix automerge will not work because of some events haven't been triggered (#30780) #31039

Merged

wxiaoguang removed the backport/v1.22 label Jun 20, 2024

go-gitea locked as resolved and limited conversation to collaborators Aug 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Also run automerge check after pull review#25741

Also run automerge check after pull review#25741
6543 wants to merge 8 commits into
go-gitea:mainfrom
6543-forks:also_auto-merge_on_review_updates

6543 commented Jul 7, 2023 •

edited by lunny

Loading

Uh oh!

rombert commented Dec 20, 2023

Uh oh!

6543 commented Dec 21, 2023

Uh oh!

lunny commented Dec 21, 2023

Uh oh!

6543 commented Mar 4, 2024 •

edited

Loading

Uh oh!

lunny commented Apr 9, 2024

Uh oh!

yp05327 commented Apr 24, 2024 •

edited

Loading

Uh oh!

lunny commented May 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

6543 commented Jul 7, 2023 • edited by lunny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rombert commented Dec 20, 2023

Uh oh!

6543 commented Dec 21, 2023

Uh oh!

lunny commented Dec 21, 2023

Uh oh!

6543 commented Mar 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lunny commented Apr 9, 2024

Uh oh!

yp05327 commented Apr 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lunny commented May 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

6543 commented Jul 7, 2023 •

edited by lunny

Loading

6543 commented Mar 4, 2024 •

edited

Loading

yp05327 commented Apr 24, 2024 •

edited

Loading