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.

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

Only check for conflicts/merging if the PR has not been merged in the interim (#10132) #10206

Merged
merged 2 commits into from Feb 10, 2020

Conversation

@6543
Copy link
Member

6543 commented Feb 10, 2020

Backports #10132

zeripath and others added 2 commits Feb 9, 2020
… interim (#10132)

* Only check for merging if the PR has not been merged in the interim

* fixup! Only check for merging if the PR has not been merged in the interim

* Try to fix test failure

* Use PR2 not PR1 in tests as PR1 merges automatically

* return already merged error

* enforce locking

* move pullrequest checking to after merge

This might improve the chance that the race does not affect us but does not prevent it.

* Remove minor race with getting merge commit id

move check pr after merge

* Remove unnecessary prepareTestEnv - onGiteaRun does this for us

* Add information about when merging occuring

* More logging

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
@lunny lunny added this to the 1.11.0 milestone Feb 10, 2020
@6543

This comment has been minimized.

Copy link
Member Author

6543 commented Feb 10, 2020

@lunny can you move milestone to 1.11.1 pleace

@lafriks lafriks modified the milestones: 1.11.0, 1.11.1 Feb 10, 2020
@lafriks lafriks added the kind/bug label Feb 10, 2020
@GiteaBot GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels Feb 10, 2020
@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Feb 10, 2020
@zeripath zeripath merged commit c95d960 into go-gitea:release/v1.11 Feb 10, 2020
2 checks passed
2 checks passed
approvals/lgtm this commit looks good
continuous-integration/drone/pr Build is passing
Details
@6543 6543 deleted the 6543-forks:backport_10132 branch Feb 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.