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

Rollup fixes #48

Merged
merged 10 commits into from
Dec 15, 2014
Merged

Rollup fixes #48

merged 10 commits into from
Dec 15, 2014

Conversation

barosl
Copy link

@barosl barosl commented Dec 15, 2014

Changes summary:

  • Bug fix: Include only the pull requests marked as "rollup" when creating a rollup
  • Use commit comments to save additional information, such as the commit IDs of the PRs
  • If one of the PRs advances or force-pushes, test again without the PR (a.k.a. "freshness" check)

@Gankra
Copy link

Gankra commented Dec 15, 2014

r? @brson

@barosl
Copy link
Author

barosl commented Dec 15, 2014

As bors now caches commit IDs in the comments, some GitHub API calls could be eliminated. However, you should @bors: retry to the existing PENDING pull request after deploying this (there is only one PENDING pull request at a time), because the cache is generated when a PR's status is changed from APPROVED to PENDING.

@barosl
Copy link
Author

barosl commented Dec 15, 2014

More changes here:

@barosl barosl force-pushed the rollup-fixes branch 4 times, most recently from c7b0b8e to 351ed7a Compare December 15, 2014 01:44
Basically, we can skip the TESTED state entirely. We can also check the
next pull request at the same time.

Fixes graydon#35.
Because of the manual closing, the pull request is occasionally set to
"closed" rather than "merged" even though it was successful. This is
because there is a little latency between the fast-forwarding and the
automatic transition to "merged".

If a bad thing happens, it would be better to leave it "open".
r+, r=me, r=[name], r-, and retry are checked more generously.
@brson
Copy link
Collaborator

brson commented Dec 15, 2014

I'm just going to merge this and hope it works.

brson added a commit that referenced this pull request Dec 15, 2014
@brson brson merged commit 6b896b0 into graydon:rust Dec 15, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants