Skip to content

Do a rebase before link checking #737

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

Merged
merged 1 commit into from
Jun 5, 2020

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Jun 5, 2020

The goal here is that people won't have to rebase over the latest master to get link fixes; instead, travis will automatically rebase on master before testing so that the latest fixes are automatically pulled in.

cc @rust-lang/wg-rustc-dev-guide This is unconventional to do in a CI tmk, so let me know if anyone sees problems here.

One disadvantage is that if there are conflicts, the build will fail, but I think that is acceptable.

@LeSeulArtichaut
Copy link
Contributor

I'm in favor of this change. It has happened quite often that PRs had to be rebased on master, which isn't necessary otherwise. Allowing CI to rebase things itself could spare us some time trying to navigate through CI logs to find out that the error is unrelated to the PR and has been fixed already 😄

This is unconventional to do in a CI tmk

IIUC @bors merges PRs before testing them? So it doesn't seem so unconventional to me. Of course, the CI testing is much more important on rust-lang/rust, but rebasing should be pretty cheap, since the commits usually aren't very large.

@chrissimpkins
Copy link
Member

Workflow will be that, if an automated rebase leads to a conflict, it fails and author rebases locally to resolve it?

@mark-i-m
Copy link
Member Author

mark-i-m commented Jun 5, 2020

@chrissimpkins Yes, that's already the case; if there is a conflict, someone needs to manually resolve it. AFAICT, this change shouldn't affect anyone's workflow, but it allows us to just restart a build rather than wait for the author to rebase.

@chrissimpkins
Copy link
Member

LGTM! 👍

@spastorino spastorino merged commit a960baa into rust-lang:master Jun 5, 2020
@mark-i-m mark-i-m deleted the test-with-rebase branch June 5, 2020 18:48
@mark-i-m mark-i-m mentioned this pull request Jun 10, 2020
This was referenced Jun 19, 2020
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.

4 participants