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

Enforce rustdoc-gui test-suite run #84586

Merged

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Apr 26, 2021

Part of #84550

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 26, 2021
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-testsuite Area: The testsuite used to check the correctness of rustc labels Apr 26, 2021
@jyn514
Copy link
Member

jyn514 commented Apr 26, 2021

By the way, Is there something else to do alongside this to be sure that the rustdoc-gui test-suite will be run on linux targets?

Yes, make sure nodejs and npm are installed on those builders. You can check by looking at the build logs for x86_64-gnu-llvm-10 and making sure rustdoc-gui isn't skipped.

src/bootstrap/test.rs Outdated Show resolved Hide resolved
@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from 9000426 to 2f0bd74 Compare April 26, 2021 12:33
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

Well, I guess now I have to add it in multiple places then. :3

@Mark-Simulacrum
Copy link
Member

Why are we putting this check on the PR builder? I understand conceptually that it's nice to get breakage early, but I worry that we shouldn't just add onto that builder without consideration. It may be worthwhile to take the approach of the tools builder, where we only run it directly on PRs with modification to the tools directory (while bors full builds always run it), and move the check from the aux builder to the tools builder.

@jyn514
Copy link
Member

jyn514 commented Apr 26, 2021

It may be worthwhile to take the approach of the tools builder, where we only run it directly on PRs with modification to the tools directory (while bors full builds always run it), and move the check from the aux builder to the tools builder.

Changes to rustdoc almost never modify the tools directory, so that means this check won't run on PRs.

@Mark-Simulacrum
Copy link
Member

Sure, we can add rustdoc to the list of things which trigger a build?

@GuillaumeGomez
Copy link
Member Author

Sure, we can add rustdoc to the list of things which trigger a build?

Just to be sure: it's something to do on "infra side", not in this PR, right?

@jyn514
Copy link
Member

jyn514 commented Apr 26, 2021

@GuillaumeGomez no, it should go in this PR. You should find where x86_64-gnu-tools determines if the check should be skipped and modify it to take src/librustdoc into account.

@GuillaumeGomez
Copy link
Member Author

I see, thanks for the clarification.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from c9fe2fc to 1a44c00 Compare April 26, 2021 15:37
Comment on lines 22 to 25
xz-utils \
nodejs
xz-utils

RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | tar -xJ
ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
Copy link
Member

Choose a reason for hiding this comment

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

Is npm not available through apt?

Copy link
Member Author

Choose a reason for hiding this comment

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

Apparently not based on the previous error.

@GuillaumeGomez
Copy link
Member Author

Another thing to be noted: if the browser-ui-test package isn't installed, we skip the rustdoc-gui tests. Should I also add the installation of this package in the Dockerfile I updated so the tests are run?

@jyn514
Copy link
Member

jyn514 commented Apr 26, 2021

if the browser-ui-test package isn't installed, we skip the rustdoc-gui tests

I thought you changed it to give a hard error? If not, can you do that now?

@GuillaumeGomez
Copy link
Member Author

No, I only enforced the presence of npm. Adding it.

@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from 1a44c00 to 3feb6ba Compare April 26, 2021 17:51
@rust-lang rust-lang deleted a comment from rust-log-analyzer Apr 26, 2021
@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch 2 times, most recently from 8a8c254 to ab2dbbe Compare April 26, 2021 18:24
@rust-lang rust-lang deleted a comment from rust-log-analyzer Apr 26, 2021
@rust-lang rust-lang deleted a comment from rust-log-analyzer Apr 26, 2021
@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from ab2dbbe to 5096bd4 Compare April 26, 2021 18:42
@rust-lang rust-lang deleted a comment from rust-log-analyzer Apr 26, 2021
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from 6b8a7c9 to 6b02464 Compare May 23, 2021 19:45
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from 6b02464 to ff7a7f6 Compare May 23, 2021 20:32
@GuillaumeGomez GuillaumeGomez 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 May 23, 2021
@GuillaumeGomez
Copy link
Member Author

@Mark-Simulacrum Updated!

@Mark-Simulacrum Mark-Simulacrum 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 May 26, 2021
@GuillaumeGomez GuillaumeGomez force-pushed the enforce-rustdoc-gui-test-suite-run branch from ff7a7f6 to 5358498 Compare May 26, 2021 08:38
@GuillaumeGomez GuillaumeGomez 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 May 26, 2021
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented May 26, 2021

@Mark-Simulacrum Seems like the CI wasn't run on rustdoc-GUI...

EDIT: i was tired, it's normal because there is no rustdoc or rustdoc-GUI changes. So all normal. Waiting for @Mark-Simulacrum final review then I guess. :)

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 29, 2021

📌 Commit 5358498 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 May 29, 2021
@bors
Copy link
Contributor

bors commented May 30, 2021

⌛ Testing commit 5358498 with merge 2023cc3...

@bors
Copy link
Contributor

bors commented May 30, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 2023cc3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 30, 2021
@bors bors merged commit 2023cc3 into rust-lang:master May 30, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 30, 2021
@GuillaumeGomez GuillaumeGomez deleted the enforce-rustdoc-gui-test-suite-run branch May 30, 2021 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants