Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Also run automerge check after pull review #25741

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Also run automerge check after pull review #25741

wants to merge 8 commits into from

Conversation

6543
Copy link
Member

@6543 6543 commented Jul 7, 2023 •
edited by lunny

Close #24445
Fix #30658

@6543 6543 added the type/enhancement An improvement of existing functionality label Jul 7, 2023
@GiteaBot 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 pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 7, 2023
@6543 6543 added this to the 1.22.0 milestone Sep 2, 2023
@rombert
Copy link

rombert commented Dec 20, 2023

Is this related to #24445 ?

@6543
Copy link
Member Author

6543 commented Dec 21, 2023

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

@lunny
Copy link
Member

lunny commented Dec 21, 2023

Automerge feature needs a redesign like Github did.

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 2, 2024
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Mar 2, 2024
@6543 6543 marked this pull request as ready for review March 2, 2024 07:36
@6543 6543 changed the title WIP: also run automerge after pull review Also run automerge check after pull review Mar 2, 2024
@6543 6543 requested a review from a team March 2, 2024 07:36
@6543 6543 added type/bug and removed type/enhancement An improvement of existing functionality labels Mar 2, 2024
@GiteaBot 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
@6543
Copy link
Member Author

6543 commented Mar 4, 2024 •
edited

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
Copy link
Member

lunny commented Apr 9, 2024

file conflicted.

@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/templates This PR modifies the template files modifies/docs modifies/migrations modifies/internal modifies/js modifies/dependencies labels Apr 18, 2024
@lunny lunny force-pushed the also_auto-merge_on_review_updates branch from 7445aae to 670e236 Compare April 18, 2024 09:29
@lunny lunny added the backport/v1.22 This PR should be backported to Gitea 1.22 label Apr 23, 2024
@yp05327
Copy link
Contributor

yp05327 commented Apr 24, 2024 •
edited

@lunny
It seems that still some problems here.
This is the reproduce(operation history):
image
ps: test env is same as ##30658

It seems that after testuser enable auto merge, and giteaadmin approved, the auto merge will be canceled.

@yp05327
Copy link
Contributor

yp05327 commented Apr 24, 2024

↑ That is because there are some errors occurred during the merge, so the auto merge status was canceled, maybe we need some notifications to the users?

@pull-request-size pull-request-size bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 24, 2024
@lunny lunny force-pushed the also_auto-merge_on_review_updates branch from 7435a03 to db4113e Compare April 24, 2024 09:03
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 24, 2024
@yp05327
Copy link
Contributor

yp05327 commented Apr 24, 2024 •
edited

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

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:
image

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

@lunny lunny modified the milestones: 1.22.0, 1.23.0 Apr 28, 2024
This was referenced Apr 30, 2024
Draft
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny left review comments

@yp05327 yp05327 yp05327 left review comments

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/v1.21 This PR should be backported to Gitea 1.21 backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/need 1 This PR needs approval from one additional maintainer to be merged. modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Can not create merge commit when checks succeed Automerge does not work
6 participants
@6543 @rombert @lunny @yp05327 @wxiaoguang @GiteaBot