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

Fix linkcheck script from getting out of sync. #85977

Merged
merged 2 commits into from
Jun 4, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 3, 2021

When there are changes to the linkcheck script, the CI jobs used in the books would download the latest version on master, but run it against nightly. During that 24 hour window, the CI can fail if the script has changes that are incompatible with the last nightly. This fixes it so that it downloads the linkchecker that matches the version of nightly.

This also includes a fix to build with release to make it run much faster (I forgot to add this in #85652).

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2021
@Mark-Simulacrum
Copy link
Member

r=me

Not sure that rustc +nightly will work (e.g., when rustup isn't available) but if it works in CI that's a good start and we can always fix it if it comes up.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2021
@rust-log-analyzer

This comment has been minimized.

@ehuss ehuss force-pushed the linkcheck-nightly branch from fe8958a to 4233a68 Compare June 3, 2021 21:06
@ehuss ehuss force-pushed the linkcheck-nightly branch from 4233a68 to 095f09a Compare June 3, 2021 21:08
@ehuss
Copy link
Contributor Author

ehuss commented Jun 3, 2021

Thanks for the speedy review!

Not sure that rustc +nightly will work (e.g., when rustup isn't available) but if it works in CI that's a good start and we can always fix it if it comes up.

All of the books install nightly in their CI, and have a prerequisite that rustup toolchain install nightly -c rust-docs is run which is checked at the top of the script.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jun 3, 2021

📌 Commit 095f09a has been approved by Mark-Simulacrum

@bors bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Jun 3, 2021

@bors rollup

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 3, 2021
…ulacrum

Fix linkcheck script from getting out of sync.

When there are changes to the linkcheck script, the CI jobs used in the books would download the latest version on master, but run it against nightly. During that 24 hour window, the CI can fail if the script has changes that are incompatible with the last nightly. This fixes it so that it downloads the linkchecker that matches the version of nightly.

This also includes a fix to build with release to make it run much faster (I forgot to add this in rust-lang#85652).
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#85717 (Document `From` impls for cow.rs)
 - rust-lang#85850 (Remove unused feature gates)
 - rust-lang#85888 (Fix typo in internal documentation for `TrustedRandomAccess`)
 - rust-lang#85889 (Restoring the `num_def_ids` function in the CStore API )
 - rust-lang#85899 (jsondocck small cleanup)
 - rust-lang#85937 (Fix bad suggestions for code from proc_macro)
 - rust-lang#85963 (Show `::{{constructor}}` in std::any::type_name().)
 - rust-lang#85977 (Fix linkcheck script from getting out of sync.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit edb8f65 into rust-lang:master Jun 4, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 4, 2021
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.

6 participants