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

Only run check-linkchecker when actually building docs #42651

Merged
merged 2 commits into from
Jun 16, 2017

Conversation

infinity0
Copy link
Contributor

Otherwise the build fails, when running tests but not building docs, e.g.:
https://buildd.debian.org/status/fetch.php?pkg=rustc&arch=ppc64el&ver=1.17.0%2Bdfsg2-3&stamp=1497403375&raw=0

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@aidanhs aidanhs assigned alexcrichton and unassigned aturon Jun 15, 2017
@aidanhs
Copy link
Member

aidanhs commented Jun 15, 2017

Thanks for the PR @infinity0, we'll make sure @alexcrichton or another reviewer gets to this soon!

@aidanhs aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2017
@alexcrichton
Copy link
Member

Thanks @infinity0! It looks like there's a stray jemalloc update here, but otherwise looks good to me!

If you're feeling extra intrepid you could add a test at the end of src/bootstrap/step.rs as well which asserts that this step doesn't show up in the final list of steps for --disable-docs builds.

@infinity0
Copy link
Contributor Author

Whoops, fixed the jemalloc thing. I thought that test was too minor to bother with, but instead I've done a more sophisticated test to check that none of the steps' dependencies contain "doc-" or "default:doc", this will catch any future targets too.

The test commit goes before the fix commit so you can check that it does indeed fail when the fix is not applied. Also, I'm not sure what Rust naming conventions are so I called it build_ but of course would be happy to rename it.

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Jun 15, 2017

📌 Commit 13b1a80 has been approved by alexcrichton

@frewsxcv
Copy link
Member

@bors rollup

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 16, 2017
Only run check-linkchecker when actually building docs

Otherwise the build fails, when running tests but not building docs, e.g.:
https://buildd.debian.org/status/fetch.php?pkg=rustc&arch=ppc64el&ver=1.17.0%2Bdfsg2-3&stamp=1497403375&raw=0
bors added a commit that referenced this pull request Jun 16, 2017
Rollup of 5 pull requests

- Successful merges: #42616, #42651, #42654, #42656, #42685
- Failed merges:
@bors bors merged commit 13b1a80 into rust-lang:master Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants