Revert "Enable docs on dist-x86_64-musl" #75102
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This reverts commit b5d143b. The commit did not enable rust-docs for rustup target x86_64-unknown-linux-musl. rust-central-station always uses x86_64-unknown-linux-gnu to publish docs.
|
That snippet from rust-central-station refers to doc.rust-lang.org, not locally installed docs. I don't think we should be reverting the patch? Are locally installed docs not yet available for you? (Maybe we need to edit manifest or something) |
@Mark-Simulacrum I am glad that you think b5d143b was the correct first step. I check the rust-component-history to see if a rust-docs component was uploaded on nightly, I haven't tried to download the docs with rustup. I have a bit of trouble connecting all the bits and pieces. I was also reading the code of the build-manifest tool.
That is a good hint. I'll try to find the relevant files. |
|
We seem to be uploading the rust-docs tarball, e.g., https://github.com/rust-lang-ci/rust/runs/938003362 uploaded to https://ci-artifacts.rust-lang.org/rustc-builds/19cefa68640843956eedd86227ddc1d35dbc6754/rust-docs-nightly-x86_64-unknown-linux-musl.tar.xz at least. I'm not yet sure why that didn't get into the manifest... |
|
aha, looks like we probably just need to add to here: rust/src/tools/build-manifest/src/main.rs Line 158 in c186aed |
…imulacrum Enable docs on in the x86_64-unknown-linux-musl manifest Add the rust-docs component to toolchain x86_64-unknown-linux-musl, which allows people using rustup on their musl-based linux distribution to download the rust-docs. Generating and uploading the docs was enabled in b5d143b (rust-lang#74871). In rust-lang#75102 @Mark-Simulacrum found that we are uploading the docs, but the correct manifest is missing. * The relevant call to build-manifest seems to be [in bootstrap](https://github.com/rust-lang/rust/blob/c058a8b8dc5dea0ed9b33e14da9e317e2749fcd7/src/bootstrap/dist.rs#L2334) * The manifest is then used in [promote-release crontab](https://github.com/rust-lang/rust-central-station/blob/master/crontab)
|
Closing fixed in #75106 |
This reverts commit b5d143b.
The commit did not enable rust-docs for rustup target x86_64-unknown-linux-musl. rust-central-station always uses x86_64-unknown-linux-gnu to publish docs.
The relevant code is here
@Mark-Simulacrum sorry for the trouble. I wasn't able to find out how it is done correctly, but I want to revert this, so load on CI is reduced. I will investigate further and open an issue before doing anything, as it seems more complex than the rust-lld patch.