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

Adding RBE as a submodule #46194 #46196

Merged
merged 1 commit into from
Jan 15, 2018
Merged

Conversation

projektir
Copy link
Contributor

Adding RBE as a submodule to start issue #46194.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Member

steveklabnik commented Nov 22, 2017

This is a needed step, but the build also needs to be updated to actually build RBE in the correct place. Look in here: https://github.com/rust-lang/rust/blob/master/src/bootstrap/doc.rs

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 23, 2017
@carols10cents
Copy link
Member

Triage: this is blocked on rust-lang/rust-by-example#962 to get tidy to pass.

@carols10cents carols10cents added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 27, 2017
@alexcrichton
Copy link
Member

r? @steveklabnik

I think I'll leave this one to the docs team

@steveklabnik
Copy link
Member

I merged the upstream issue.

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Nov 27, 2017
@kennytm
Copy link
Member

kennytm commented Nov 27, 2017

@projektir You may update the submodule to point at the latest RBE master now.

@projektir
Copy link
Contributor Author

It should already be pointed if I understand submodules right, this just needs to be refreshed?

@steveklabnik
Copy link
Member

It doesn't look like it. Maybe you forgot to push the new commit?

@kennytm kennytm 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 Nov 27, 2017
@kennytm
Copy link
Member

kennytm commented Nov 27, 2017

At least one RBE sample is failing. Our $PATH doesn't contain rustc...

[01:19:09] command did not execute successfully: "/checkout/obj/build/bootstrap/debug/rustdoc" "--test" "/checkout/src/doc/rust-by-example/src/std_misc/process.md" "--test-args" ""
[01:19:09] expected success, got: exit code: 101
[01:19:09] 
[01:19:09] stdout ----
[01:19:09] 
[01:19:09] running 1 test
[01:19:09] test /checkout/src/doc/rust-by-example/src/std_misc/process.md - Child_processes (line 6) ... FAILED
[01:19:09] 
[01:19:09] failures:
[01:19:09] 
[01:19:09] ---- /checkout/src/doc/rust-by-example/src/std_misc/process.md - Child_processes (line 6) stdout ----
[01:19:09] 	thread 'rustc' panicked at 'test executable failed:
[01:19:09] 
[01:19:09] thread 'main' panicked at 'failed to execute process: No such file or directory (os error 2)', /checkout/src/doc/rust-by-example/src/std_misc/process.md:8:12
[01:19:09] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:19:09] 
[01:19:09] ', /checkout/src/librustdoc/test.rs:322:16
[01:19:09] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:19:09] 
[01:19:09] 
[01:19:09] failures:
[01:19:09]     /checkout/src/doc/rust-by-example/src/std_misc/process.md - Child_processes (line 6)
[01:19:09] 
[01:19:09] test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:19:09] 
[01:19:09] 
[01:19:09] stderr ----

@steveklabnik
Copy link
Member

That's marked as runnable because the playground does...

I would be okay with ignoring it in RBE, I think, as it's not like it's that important anyway.

@shepmaster shepmaster 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 Dec 1, 2017
@shepmaster
Copy link
Member

@projektir If I am following along correctly, I think you will need to update the submodule reference in this PR again.

@projektir projektir force-pushed the rbe-submodule branch 2 times, most recently from 04ebd7a to e161009 Compare December 2, 2017 02:31
@projektir
Copy link
Contributor Author

@steveklabnik We fixed up the various linking issues and looks like this is passing again! 😄

@kennytm kennytm 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 Jan 14, 2018
@steveklabnik
Copy link
Member

@bors: r+

Thank you @projektir ; what should have been a simple PR has really been a wild ride.

@bors
Copy link
Contributor

bors commented Jan 14, 2018

📌 Commit a2df413 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Jan 14, 2018

⌛ Testing commit a2df413 with merge dc272c3...

bors added a commit that referenced this pull request Jan 14, 2018
Adding RBE as a submodule #46194

Adding RBE as a submodule to start issue #46194.
@bors
Copy link
Contributor

bors commented Jan 15, 2018

💔 Test failed - status-appveyor

@steveklabnik
Copy link
Member

The build log is so long I can't see what the failure was. Since it's only on one arch, I'm assuming it was spurious.

@bors: retry

@steveklabnik steveklabnik added relnotes Marks issues that should be documented in the release notes of the next release. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 15, 2018
@projektir
Copy link
Contributor Author

projektir commented Jan 15, 2018

Was it this: "Build execution time has reached the maximum allowed time for your plan (180 minutes)."? Seems like the failed arch was Windows GNU. Hopefully spurious...

@bors
Copy link
Contributor

bors commented Jan 15, 2018

⌛ Testing commit a2df413 with merge bb345a0...

bors added a commit that referenced this pull request Jan 15, 2018
Adding RBE as a submodule #46194

Adding RBE as a submodule to start issue #46194.
@bors
Copy link
Contributor

bors commented Jan 15, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: steveklabnik
Pushing bb345a0 to master...

@bors bors merged commit a2df413 into rust-lang:master Jan 15, 2018
@projektir projektir deleted the rbe-submodule branch January 15, 2018 05:25
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 16, 2018
…teveklabnik

Report errors instead of panic!() when linkcheck encounters absolute paths

The RBE contained some absolute links that failed the link check in rust-lang#46196. Diagnosing these issues was needlessly complicated, thanks to the linkchecker just panicing instead of reporting proper errors.

This PR replaces the panic with a proper `*errors = true` + error message handling.

The linkchecker itself doesn't have any tests so I intentionally didn't touch anything else than the code that previously did the `panic!()`. A small code quality improvement might be made by binding the `Path::new(base).join(url)` into a variable before the for-loop and using this resolved url in both the for loop and the error message.

r? @steveklabnik

(If not for any other reason than having r on the rust-lang#46196.)
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 16, 2018
…teveklabnik

Report errors instead of panic!() when linkcheck encounters absolute paths

The RBE contained some absolute links that failed the link check in rust-lang#46196. Diagnosing these issues was needlessly complicated, thanks to the linkchecker just panicing instead of reporting proper errors.

This PR replaces the panic with a proper `*errors = true` + error message handling.

The linkchecker itself doesn't have any tests so I intentionally didn't touch anything else than the code that previously did the `panic!()`. A small code quality improvement might be made by binding the `Path::new(base).join(url)` into a variable before the for-loop and using this resolved url in both the for loop and the error message.

r? @steveklabnik

(If not for any other reason than having r on the rust-lang#46196.)
kennytm added a commit to kennytm/rust that referenced this pull request Jan 17, 2018
…teveklabnik

Report errors instead of panic!() when linkcheck encounters absolute paths

The RBE contained some absolute links that failed the link check in rust-lang#46196. Diagnosing these issues was needlessly complicated, thanks to the linkchecker just panicing instead of reporting proper errors.

This PR replaces the panic with a proper `*errors = true` + error message handling.

The linkchecker itself doesn't have any tests so I intentionally didn't touch anything else than the code that previously did the `panic!()`. A small code quality improvement might be made by binding the `Path::new(base).join(url)` into a variable before the for-loop and using this resolved url in both the for loop and the error message.

r? @steveklabnik

(If not for any other reason than having r on the rust-lang#46196.)
kennytm added a commit to kennytm/rust that referenced this pull request Jan 17, 2018
…teveklabnik

Report errors instead of panic!() when linkcheck encounters absolute paths

The RBE contained some absolute links that failed the link check in rust-lang#46196. Diagnosing these issues was needlessly complicated, thanks to the linkchecker just panicing instead of reporting proper errors.

This PR replaces the panic with a proper `*errors = true` + error message handling.

The linkchecker itself doesn't have any tests so I intentionally didn't touch anything else than the code that previously did the `panic!()`. A small code quality improvement might be made by binding the `Path::new(base).join(url)` into a variable before the for-loop and using this resolved url in both the for loop and the error message.

r? @steveklabnik

(If not for any other reason than having r on the rust-lang#46196.)
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 19, 2018
…eveklabnik

add Rust By Example to the bookshelf

cc rust-lang#46194

With rust-lang#46196 freshly merged, we should add a link to the main docs distribution so people can find it! We discussed this at the docs team meeting today and decided to go ahead with adding it to the bookshelf.
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 20, 2018
…eveklabnik

add Rust By Example to the bookshelf

cc rust-lang#46194

With rust-lang#46196 freshly merged, we should add a link to the main docs distribution so people can find it! We discussed this at the docs team meeting today and decided to go ahead with adding it to the bookshelf.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools relnotes Marks issues that should be documented in the release notes of the next release.
Projects
None yet
Development

Successfully merging this pull request may close these issues.