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

Don't run sanity checks for x.py setup #84940

Merged
merged 1 commit into from Jun 7, 2021
Merged

Don't run sanity checks for x.py setup #84940

merged 1 commit into from Jun 7, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented May 5, 2021

These requirements change as soon as the command finishes running, and
setup doesn't build anything, so the check doesn't make sense.

Previously, x.py setup would give hard errors if ninja and cmake
were not installed, even if the new profile didn't require them.

Fixes #84938.

@jyn514 jyn514 added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself labels May 5, 2021
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 May 5, 2021
@joshtriplett
Copy link
Member

Seems reasonable, given that we don't use it for anything else.

@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 6, 2021
@jyn514 jyn514 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 7, 2021
@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 10, 2021
@jyn514 jyn514 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 19, 2021
@Mark-Simulacrum
Copy link
Member

Uh, I don't see a response to #84940 (comment) -- either in commits or the comment thread. So I think this is waiting on author still?

@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
@jyn514
Copy link
Member Author

jyn514 commented May 26, 2021

@Mark-Simulacrum yeah I haven't gotten around to this PR - I think you forgot to switch the labels the last time.

These requirements change as soon as the command finishes running, and
`setup` doesn't build anything, so the check doesn't make sense.

Previously, `x.py setup` would give hard errors if `ninja` and `cmake`
were not installed, even if the new profile didn't require them.
@jyn514 jyn514 changed the title Don't require ninja unless building LLVM Don't run sanity checks for x.py setup Jun 4, 2021
@jyn514 jyn514 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 Jun 4, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 6, 2021

📌 Commit 3aefd77 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 Jun 6, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2021
…laumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#83433 (Pass --cfg=bootstrap for proc macros built by stage0)
 - rust-lang#84940 (Don't run sanity checks for `x.py setup`)
 - rust-lang#85912 (Use `Iterator::any` and `filter_map` instead of open-coding them)
 - rust-lang#85965 (Remove dead code from `LocalAnalyzer`)
 - rust-lang#86010 (Fix two ICEs in the parser)
 - rust-lang#86040 (Fix display for search results)
 - rust-lang#86058 (Remove `_`  from E0121 diagnostic suggestions)
 - rust-lang#86077 (Fix corrected example in E0759.md)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 83664bd into rust-lang:master Jun 7, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 7, 2021
@jyn514 jyn514 deleted the ninja branch June 7, 2021 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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.

python x.py setup complains about missing ninja
6 participants