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

Enable docs on dist-x86_64-musl #74871

Merged
merged 1 commit into from Jul 30, 2020
Merged

Enable docs on dist-x86_64-musl #74871

merged 1 commit into from Jul 30, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jul 28, 2020

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.

--disable-docs is based on the assumption that x86_64-unknown-linux-musl is only a cross-compile target.

I have tested that the docs are built. I assume the build-system will automatically detect the docs and create a rust-docs component. I will monitor the components and create a follow-up PR, if the docs aren't published.

See also #70619, where we enabled rust-lld to enable the wasm-workflow on musl-based linux distributions.

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.
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Jul 28, 2020
@Mark-Simulacrum
Copy link
Member

musl is at 1h 7m currently, at least based off of one build, so I think it should be fine to merge this since we're at an overall ceiling of around 2 hours.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 28, 2020

📌 Commit b5d143b 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

⌛ Testing commit b5d143b with merge 022af3a6dc0dc3137483b41e581dbdaeea49fa2a...

@bors
Copy link
Contributor

bors commented Jul 28, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2020
@ghost
Copy link
Author

ghost commented Jul 30, 2020

The error I see is completely unrelated. I wonder if I am allowed to do that:

@bors retry

@bors
Copy link
Contributor

bors commented Jul 30, 2020

@Etherealist: 🔑 Insufficient privileges: not in try users

@Mark-Simulacrum
Copy link
Member

@bors retry

Cargo spurious test failure? cc @ehuss

2020-07-28T13:54:52.5177406Z failures:
2020-07-28T13:54:52.5177550Z 
2020-07-28T13:54:52.5182260Z ---- lto::dev_profile stdout ----
2020-07-28T13:54:52.5182838Z running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo test -v`
2020-07-28T13:54:52.5183333Z thread 'lto::dev_profile' panicked at '
2020-07-28T13:54:52.5183512Z Expected: execs
2020-07-28T13:54:52.5183700Z     but: differences:
2020-07-28T13:54:52.5184158Z   6 - |[RUNNING] `rustc --crate-name foo [..]--crate-type lib --emit=dep-info,metadata,link -Clinker-plugin-lto [..]|
2020-07-28T13:54:52.5185363Z     + |     Running `rustc --crate-name foo --edition=2018 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi --emit=dep-info,link -Cembed-bitcode=no -C debuginfo=2 --test -C metadata=110e52c96c1b8618 -C extra-filename=-110e52c96c1b8618 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1067/foo/target/debug/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1067/foo/target/debug/deps --extern bar=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1067/foo/target/debug/deps/libbar-d2876efba7515ca8.rlib`|
2020-07-28T13:54:52.5194205Z 
2020-07-28T13:54:52.5195505Z   7 - |[RUNNING] `rustc --crate-name foo [..]--emit=dep-info,link -Cembed-bitcode=no [..]--test[..]|
2020-07-28T13:54:52.5197737Z     + |     Running `rustc --crate-name foo --edition=2018 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi --crate-type lib --emit=dep-info,metadata,link -Clinker-plugin-lto -C debuginfo=2 -C metadata=aae1986730f9b7d9 -C extra-filename=-aae1986730f9b7d9 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1067/foo/target/debug/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1067/foo/target/debug/deps --extern bar=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1067/foo/target/debug/deps/libbar-d2876efba7515ca8.rmeta`|
2020-07-28T13:54:52.5198297Z 
2020-07-28T13:54:52.5198427Z 
2020-07-28T13:54:52.5198681Z other output:
2020-07-28T13:54:52.5198971Z `
2020-07-28T13:54:52.5199230Z running 1 test
2020-07-28T13:54:52.5199752Z test t1 ... ok
2020-07-28T13:54:52.5200043Z 
2020-07-28T13:54:52.5200582Z test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
2020-07-28T13:54:52.5200749Z 
2020-07-28T13:54:52.5200827Z 
2020-07-28T13:54:52.5201014Z running 0 tests
2020-07-28T13:54:52.5201113Z 
2020-07-28T13:54:52.5201289Z test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
2020-07-28T13:54:52.5201422Z 
2020-07-28T13:54:52.5201971Z `', src/tools/cargo/crates/cargo-test-support/src/lib.rs:832:13
2020-07-28T13:54:52.5202177Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-07-28T13:54:52.5202307Z 
2020-07-28T13:54:52.5202397Z 
2020-07-28T13:54:52.5202544Z failures:
2020-07-28T13:54:52.5202715Z     lto::dev_profile

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2020
@ehuss
Copy link
Contributor

ehuss commented Jul 30, 2020

Thanks for the ping! That error has been fixed yesterday via #74923 (rust-lang/cargo#8559).

@bors
Copy link
Contributor

bors commented Jul 30, 2020

⌛ Testing commit b5d143b with merge a932dedafa960cf337e78bd4b01e07ada47a3a05...

@bors
Copy link
Contributor

bors commented Jul 30, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing a932dedafa960cf337e78bd4b01e07ada47a3a05 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 30, 2020
@bors
Copy link
Contributor

bors commented Jul 30, 2020

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@ehuss
Copy link
Contributor

ehuss commented Jul 30, 2020

422 Update is not a fast forward

rust-lang/homu#75
😦
@bors retry

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2020
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#74751 (Clean up E0730 explanation)
 - rust-lang#74782 (Don't use "weak count" around Weak::from_raw_ptr)
 - rust-lang#74835 (Clean up E0734 explanation)
 - rust-lang#74871 (Enable docs on dist-x86_64-musl)
 - rust-lang#74905 (Avoid bool-like naming)
 - rust-lang#74907 (Clean up E0740 explanation)
 - rust-lang#74915 (rustc: Ignore fs::canonicalize errors in metadata)
 - rust-lang#74934 (Improve diagnostics when constant pattern is too generic)
 - rust-lang#74951 (Cherry-pick the release notes for 1.45.1)

Failed merges:

r? @ghost
@bors bors merged commit 8892785 into rust-lang:master Jul 30, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 4, 2020
…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)
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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