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.

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

make it possible to disable download-rustc if it's incompatible #128098

Merged
merged 1 commit into from
Jul 23, 2024
Merged

make it possible to disable download-rustc if it's incompatible #128098

merged 1 commit into from
Jul 23, 2024
+25 −11

Conversation

onur-ozkan
Copy link
Member

Primarily needed by CI runners to avoid handling download-rustc incompatible options one by one on shell scripts.

This will significantly help to #122709.

@onur-ozkan
make it possible to disable download-rustc if it's incompatible
d4f3673 
Primarily needed by CI runners to avoid handling download-rustc incompatible
options one by one on shell scripts.

Signed-off-by: onur-ozkan <[email protected]>
@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 23, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Kobzol
Kobzol reviewed Jul 23, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Looks fine, although random env. vars are hard to discover (maybe we should at least document this in config.example.toml?). What do you think about just using a different mode instead? Something like rust.download-rustc = "if-compatible".

@onur-ozkan
Copy link
Member Author

Looks fine, although random env. vars are hard to discover (maybe we should at least document this in config.example.toml?). What do you think about just using a different mode instead? Something like rust.download-rustc = "if-compatible".

I think adding another mode to download-rustc makes it complicated than it should be. We only need this for CI and no one should need/use it for local development. As for documenting it, I can make a follow-up PR on https://github.com/rust-lang/rustc-dev-guide.

@Kobzol
Copy link
Contributor

Kobzol commented Jul 23, 2024

Right, I considered this to also be user-facing, because I myself had a use-case for it 😆 (as we discussed on Zulip). If it's really only for CI, then fine by me.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2024

📌 Commit d4f3673 has been approved by Kobzol

It is now in the queue for this repository.

@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 Jul 23, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@bors
Auto merge of rust-lang#128109 - matthiaskrgr:rollup-gc7kopi, r=matth…
8bfcae7 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125886 (Migrate run make issue 15460)
 - rust-lang#126898 (Migrate `run-make/link-framework` to `rmake.rs`)
 - rust-lang#126994 (Support lists and stylings in more places for `rustc --explain`)
 - rust-lang#127990 (Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake)
 - rust-lang#128060 (Fix inclusion of `wasm-component-ld` in dist artifacts)
 - rust-lang#128082 (Note closure captures when reporting cast to fn ptr failed)
 - rust-lang#128098 (make it possible to disable download-rustc if it's incompatible)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 041b8c4 into rust-lang:master Jul 23, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@rust-timer
Unrolled build for rust-lang#128098
6ee3897 
Rollup merge of rust-lang#128098 - onur-ozkan:incompatible-option-behaviour, r=Kobzol

make it possible to disable download-rustc if it's incompatible

Primarily needed by CI runners to avoid handling download-rustc incompatible options one by one on shell scripts.

This will significantly help to rust-lang#122709.
@rustbot rustbot added this to the 1.82.0 milestone Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

Labels
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
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@onur-ozkan @rustbot @Kobzol @bors