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

rustbuild: Don't try to build rustdoc API docs with compiler docs #45366

Merged
merged 1 commit into from
Oct 21, 2017

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Oct 18, 2017

rustdoc is built separately to rustc now so the docs would need to be
generated separately as well. Also rustdoc doesn't build at stage 1
which prevented the compiler docs being built at stage 1.

Fixes: #44629

rustdoc is built separately to rustc now so the docs would need to be
generated separately as well. Also rustdoc doesn't build at stage 1
which prevented the compiler docs being built at stage 1.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm
Copy link
Member

kennytm commented Oct 18, 2017

@ollie27 #44629 affects doc --stage 2 as well. Are you sure this change can fix #44629 as in doc --stage 2 will work?

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 18, 2017
@ollie27
Copy link
Member Author

ollie27 commented Oct 18, 2017

It should fix it yeah. I'm pretty sure that unless you use full-bootstrap = true that stage 1 is basically the same as stage 2 anyway. Not building the docs for rustdoc which will mean not building rustdoc's dependencies should fix the build as long as the error is in building cssparser.

@alexcrichton
Copy link
Member

@bors: r+

Thanks @ollie27!

@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 18, 2017
@ollie27
Copy link
Member Author

ollie27 commented Oct 21, 2017

Did bors miss the r+? This isn't showing as approved on https://buildbot2.rust-lang.org/homu/queue/rust.

@kennytm
Copy link
Member

kennytm commented Oct 21, 2017

@bors r=alexcrichton

Let's try again.

@bors
Copy link
Contributor

bors commented Oct 21, 2017

📌 Commit 1652c58 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Oct 21, 2017

⌛ Testing commit 1652c58 with merge ff8773d...

bors added a commit that referenced this pull request Oct 21, 2017
rustbuild: Don't try to build rustdoc API docs with compiler docs

rustdoc is built separately to rustc now so the docs would need to be
generated separately as well. Also rustdoc doesn't build at stage 1
which prevented the compiler docs being built at stage 1.

Fixes: #44629
@bors
Copy link
Contributor

bors commented Oct 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing ff8773d to master...

@bors bors merged commit 1652c58 into rust-lang:master Oct 21, 2017
@ollie27 ollie27 deleted the rustbuild_compiler_docs branch October 22, 2017 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants