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

Attempt to handle unready PR in tests #13305

Merged
merged 3 commits into from Oct 25, 2020

Conversation

zeripath
Copy link
Contributor

This PR makes doAPIMergePullRequest flush queues and try again if it gets a try-again message.

Signed-off-by: Andrew Thornton art27@cantab.net

Signed-off-by: Andrew Thornton <art27@cantab.net>
@codecov-io
Copy link

codecov-io commented Oct 25, 2020

Codecov Report

Merging #13305 into master will increase coverage by 0.10%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13305      +/-   ##
==========================================
+ Coverage   41.99%   42.10%   +0.10%     
==========================================
  Files         689      689              
  Lines       75771    75771              
==========================================
+ Hits        31823    31906      +83     
+ Misses      38735    38631     -104     
- Partials     5213     5234      +21     
Impacted Files Coverage Δ
models/repo_mirror.go 2.38% <0.00%> (-11.91%) ⬇️
services/pull/check.go 45.98% <0.00%> (-3.65%) ⬇️
modules/cron/tasks_basic.go 87.35% <0.00%> (-3.45%) ⬇️
modules/log/event.go 59.90% <0.00%> (-1.89%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0.00%> (-1.54%) ⬇️
services/mirror/mirror.go 16.17% <0.00%> (-1.18%) ⬇️
services/pull/pull.go 40.78% <0.00%> (+0.49%) ⬆️
models/error.go 35.72% <0.00%> (+0.50%) ⬆️
services/mailer/mail.go 61.29% <0.00%> (+1.07%) ⬆️
modules/queue/workerpool.go 60.00% <0.00%> (+1.22%) ⬆️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7974b34...520d9dd. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 25, 2020
@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 Oct 25, 2020
@techknowlogick techknowlogick added this to the 1.14.0 milestone Oct 25, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 25, 2020
@zeripath zeripath merged commit 66dcf10 into go-gitea:master Oct 25, 2020
@zeripath zeripath deleted the try-again-merge-request branch October 25, 2020 20:56
zeripath added a commit to zeripath/gitea that referenced this pull request Oct 25, 2020
Backport go-gitea#13305

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit to zeripath/gitea that referenced this pull request Oct 25, 2020
Backport go-gitea#13305

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added the backport/done All backports for this PR have been created label Oct 25, 2020
lunny pushed a commit that referenced this pull request Oct 26, 2020
Backport #13305

Signed-off-by: Andrew Thornton <art27@cantab.net>
lunny added a commit that referenced this pull request Oct 26, 2020
Backport #13305

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
ivanvc added a commit to ivanvc/gitea that referenced this pull request Oct 27, 2020
…s-stored-in-email-address-table

* origin/master:
  [UI] Hide consecutive additions and removals of the same label (go-gitea#13315)
  [skip ci] Updated translations via Crowdin
  Fix send mail (go-gitea#13312)
  [skip ci] Updated translations via Crowdin
  Deny wrong pull (go-gitea#13308)
  Group Label Changed Comments in timeline (go-gitea#13304)
  [skip ci] Updated translations via Crowdin
  Attempt to handle unready PR in tests (go-gitea#13305)
  go-gitea#12897 - add mastodon provider (go-gitea#13293)
  [skip ci] Updated translations via Crowdin
  Fix Storage mapping (go-gitea#13297)
  Update Mirror IsEmpty status on synchronize (go-gitea#13185)
  Fix bug isEnd detection on getIssues/getPullRequests (go-gitea#13299)
  systemd service: Add commented PATH environment option for Git prefix (go-gitea#13170)
  Sendmail command (go-gitea#13079)
  Various UI and arc-green fixes (go-gitea#13291)
@6543 6543 added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Nov 10, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants