Skip to content

Make bootstrap build on beta #76423

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 8, 2020
Merged

Make bootstrap build on beta #76423

merged 1 commit into from
Sep 8, 2020

Conversation

@Mark-Simulacrum
Copy link
Member

This is generally a good idea, and will help with being able to build bootstrap
without Python over time as it means we can "just" build with cargo +beta build
rather than needing the user to set environment variables. This is a minor step,
but a necessary one on that road.

r? @jyn514
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2020
Mark-Simulacrum
Mark-Simulacrum commented Sep 6, 2020
View reviewed changes
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 7, 2020
jyn514
jyn514 reviewed Sep 7, 2020
View reviewed changes
@jyn514 jyn514 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 Sep 7, 2020
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 7, 2020
jyn514
jyn514 reviewed Sep 7, 2020
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with logic bug fixed
@jyn514 jyn514 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 Sep 7, 2020
@Mark-Simulacrum
Make bootstrap build on stable
2656d34 
This is generally a good idea, and will help with being able to build bootstrap without Python over time as it means we can "just" build with cargo +beta build rather than needing the user to set environment variables. This is a minor step, but a necessary one on that road.
@jyn514
Copy link
Member

jyn514 commented Sep 7, 2020

@bors r+

Thanks for working on this!
@bors
Copy link
Collaborator

bors commented Sep 7, 2020

📌 Commit 2656d34 has been approved by jyn514
@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 Sep 7, 2020
@bors
Copy link
Collaborator

bors commented Sep 7, 2020

⌛ Testing commit 2656d34 with merge 4c3bed6d2897113c8ae31fe846de36ce4a7801ca...
@bors
Copy link
Collaborator

bors commented Sep 7, 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 Sep 7, 2020
@mati865
Copy link
Member

mati865 commented Sep 7, 2020

I've seen this spurious error before, Rustdoc output was not deterministic:

Details 
failures: ---- [ui] rustdoc-ui\failed-doctest-output.rs stdout ---- \rustdoc-ui\failed-doctest-output.rs \rustdoc-ui\failed-doctest-output.rs \rustdoc-ui\failed-doctest-output.rs thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:354:22 \rustdoc-ui\failed-doctest-output.rs \rustdoc-ui\failed-doctest-output.rs \rustdoc-ui\failed-doctest-output.rs \rustdoc-ui\failed-doctest-output.rs note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace \rustdoc-ui\failed-doctest-output.rs diff of stdout: 1 2	running 2 tests -	test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED 4	test $DIR/failed-doctest-output.rs - SomeStruct (line 11) ... FAILED +	test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED 5 6	failures: 7 -	---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ---- -	error[E0425]: cannot find value `no` in this scope - --> $DIR/failed-doctest-output.rs:22:1 - | -	LL | no - | ^^ not found in this scope - -	error: aborting due to previous error - -	For more information about this error, try `rustc --explain E0425`. -	Couldn't compile the test. 19	---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ---- 20	Test executable failed (exit code 101). 21 30	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace 31 32 +	---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ---- +	error[E0425]: cannot find value `no` in this scope + --> $DIR/failed-doctest-output.rs:22:1 + | +	LL | no + | ^^ not found in this scope + +	error: aborting due to previous error + +	For more information about this error, try `rustc --explain E0425`. +	Couldn't compile the test. 33 34	failures: 35 $DIR/failed-doctest-output.rs - OtherStruct (line 21)
@jyn514
Copy link
Member

jyn514 commented Sep 7, 2020

@bors retry
@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 Sep 7, 2020
@jyn514 jyn514 mentioned this pull request Sep 7, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 7, 2020
@Dylan-DPC
Rollup merge of rust-lang#76423 - Mark-Simulacrum:stable-bootstrap, r…
4ab3677 
…=jyn514 Make bootstrap build on beta This is generally a good idea, and will help with being able to build bootstrap without Python over time as it means we can "just" build with cargo +beta build rather than needing the user to set environment variables. This is a minor step, but a necessary one on that road. r? @jyn514
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Sep 7, 2020
Closed
@bors
Copy link
Collaborator

bors commented Sep 8, 2020

⌛ Testing commit 2656d34 with merge 35fc835...
@bors
Copy link
Collaborator

bors commented Sep 8, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: jyn514
Pushing 35fc835 to master...
@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2020
@bors bors merged commit 35fc835 into rust-lang:master Sep 8, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 8, 2020
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 9, 2020
Closed
@matklad
Copy link
Contributor

matklad commented Sep 11, 2020

@mati865 do we have an issue open to track #76423 (comment) ? I was bitten by this once, I might want to take a look.
@jyn514
Copy link
Member

jyn514 commented Sep 11, 2020

@matklad it's fixed on master #76442
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

7 participants

@Mark-Simulacrum @jyn514 @bors @mati865 @matklad @rust-highfive @rustbot