Make bootstrap build on beta #76423

Mark-Simulacrum · 2020-09-06T23:45:12Z

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

src/bootstrap/tool.rs

src/bootstrap/bootstrap.py

src/bootstrap/tool.rs

jyn514

r=me with logic bug fixed

src/bootstrap/tool.rs

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 · 2020-09-07T01:31:27Z

@bors r+

Thanks for working on this!

bors · 2020-09-07T01:31:29Z

📌 Commit 2656d34 has been approved by jyn514

bors · 2020-09-07T04:15:53Z

⌛ Testing commit 2656d34 with merge 4c3bed6d2897113c8ae31fe846de36ce4a7801ca...

bors · 2020-09-07T05:20:40Z

💔 Test failed - checks-actions

mati865 · 2020-09-07T09:54:43Z

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 · 2020-09-07T12:06:02Z

@bors retry

@jyn514

…=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

bors · 2020-09-08T07:08:55Z

⌛ Testing commit 2656d34 with merge 35fc835...

bors · 2020-09-08T09:11:35Z

☀️ Test successful - checks-actions, checks-azure
Approved by: jyn514
Pushing 35fc835 to master...

matklad · 2020-09-11T12:20:29Z

@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 · 2020-09-11T12:31:30Z

@matklad it's fixed on master #76442

rust-highfive assigned jyn514 Sep 6, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2020

Mark-Simulacrum commented Sep 6, 2020

View reviewed changes

src/bootstrap/tool.rs Outdated Show resolved Hide resolved

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 reviewed Sep 7, 2020

View reviewed changes

src/bootstrap/bootstrap.py Show resolved Hide resolved

src/bootstrap/tool.rs Outdated Show resolved Hide resolved

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 force-pushed the stable-bootstrap branch from beadb20 to ae374e0 Compare September 7, 2020 00:38

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 reviewed Sep 7, 2020

View reviewed changes

src/bootstrap/tool.rs Outdated Show resolved Hide resolved

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 force-pushed the stable-bootstrap branch from ae374e0 to 2656d34 Compare September 7, 2020 01:26

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 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

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 mentioned this pull request Sep 7, 2020

Rustdoc output is not deterministic for failed doctests #76442

Closed

Dylan-DPC-zz mentioned this pull request Sep 7, 2020

Rollup of 10 pull requests #76456

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2020

bors merged commit 35fc835 into rust-lang:master Sep 8, 2020

rustbot added this to the 1.48.0 milestone Sep 8, 2020

matthiaskrgr mentioned this pull request Sep 9, 2020

x.py clean does not clean bootstrap anymore #76519

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make bootstrap build on beta #76423

Make bootstrap build on beta #76423

Mark-Simulacrum commented Sep 6, 2020

jyn514 left a comment

jyn514 commented Sep 7, 2020

bors commented Sep 7, 2020

bors commented Sep 7, 2020

bors commented Sep 7, 2020

mati865 commented Sep 7, 2020

jyn514 commented Sep 7, 2020

bors commented Sep 8, 2020

bors commented Sep 8, 2020

matklad commented Sep 11, 2020

jyn514 commented Sep 11, 2020

Make bootstrap build on beta #76423

Make bootstrap build on beta #76423

Conversation

Mark-Simulacrum commented Sep 6, 2020

jyn514 left a comment

Choose a reason for hiding this comment

jyn514 commented Sep 7, 2020

bors commented Sep 7, 2020

bors commented Sep 7, 2020

bors commented Sep 7, 2020

mati865 commented Sep 7, 2020

jyn514 commented Sep 7, 2020

bors commented Sep 8, 2020

bors commented Sep 8, 2020

matklad commented Sep 11, 2020

jyn514 commented Sep 11, 2020