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

rustbuild: Build stage 1 error index generator at stage 0 #45432

Merged
merged 1 commit into from
Oct 22, 2017
Merged

rustbuild: Build stage 1 error index generator at stage 0 #45432

merged 1 commit into from
Oct 22, 2017

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Oct 21, 2017

At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes x.py --stage 1 doc as rustdoc doesn't even build at stage 1.

It was broken by #44605.

r? @alexcrichton

@ollie27
rustbuild: Build stage 1 error index generator at stage 0
2045e07 
At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes `x.py --stage 1 doc` as rustdoc doesn't even build at stage 1.
@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2017
@Mark-Simulacrum
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Oct 21, 2017

📌 Commit 2045e07 has been approved by Mark-Simulacrum

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2017
@bors
Copy link
Contributor

bors commented Oct 22, 2017

⌛ Testing commit 2045e07 with merge 3bb8695532d14a1a8171ff072c1c9fc5baff122e...

@bors
Copy link
Contributor

bors commented Oct 22, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Oct 22, 2017

@bors retry

dist i686-pc-windows-msvc 3-hour timed out due to spurious network issue that wasted almost 2 hours on reaching https://github.com/rust-lang/crates.io-index. Both AppVeyor and GitHub's status are green.

[00:02:44] extracting C:\projects\rust\build\cache\2017-08-29\cargo-beta-i686-pc-windows-msvc.tar.gz
[00:02:44]     Updating registry `https://github.com/rust-lang/crates.io-index`
[01:53:12] warning: spurious network error (2 tries remaining): [2/-1] failed to read data: The server returned an invalid or unrecognized response
[01:53:12] 
[01:53:26]  Downloading cc v1.0.1
[01:53:27]  Downloading serde_derive v1.0.15

@bors
Copy link
Contributor

bors commented Oct 22, 2017

⌛ Testing commit 2045e07 with merge 942f31f...

bors added a commit that referenced this pull request Oct 22, 2017
@bors
Auto merge of #45432 - ollie27:rustbuild_error_index_gen, r=Mark-Simu…
942f31f 
…lacrum

rustbuild: Build stage 1 error index generator at stage 0

At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes `x.py --stage 1 doc` as rustdoc doesn't even build at stage 1.

It was broken by #44605.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Oct 22, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 942f31f to master...

@bors bors merged commit 2045e07 into rust-lang:master Oct 22, 2017
@ollie27 ollie27 deleted the rustbuild_error_index_gen branch October 22, 2017 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ollie27 @Mark-Simulacrum @bors @kennytm @alexcrichton