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

use download-rustc="if-unchanged" as a global default #132772

Merged
merged 4 commits into from
Nov 9, 2024
Merged

use download-rustc="if-unchanged" as a global default #132772

merged 4 commits into from
Nov 9, 2024

Conversation

onur-ozkan
Copy link
Member

If download-rustc isn't explicitly set and the source is Git-managed, it should be totally okay to utilize "if-unchanged" behaviour. The "dist" profile already sets download-rustc to false, so this shouldn’t impact anything on CI.

This also resolves an unhandled case where bootstrap unexpectedly panics if "if-unchanged" was used with a non-Git source. Now we exits gracefully with an error message pointing the problem.

@onur-ozkan
read repository information configs at an earlier stage
76b6090 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
use download-rustc="if-unchanged" as default whenever possible
cce6f03 
"whenever possible" means applying it if `download-rustc` isn't explicitly set and
the source is Git-managed.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
respect to global download-rustc default in non-dist profiles
2e0afc8 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Nov 8, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 Nov 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 8, 2024

This PR modifies src/bootstrap/defaults.

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

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

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan 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 Nov 8, 2024
@onur-ozkan
fix core::config::tests::override_toml
2a38108 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@rustbot ready

@rustbot rustbot 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 9, 2024
jieyouxu
jieyouxu approved these changes Nov 9, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks, this makes sense to me. One question, r=me otherwise.

src/bootstrap/src/core/config/config.rs Show resolved Hide resolved
@jieyouxu
Copy link
Member

jieyouxu commented Nov 9, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Nov 9, 2024

📌 Commit 2a38108 has been approved by jieyouxu

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 Nov 9, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 9, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 9, 2024
@bors
Auto merge of rust-lang#132815 - matthiaskrgr:rollup-nti992u, r=matth…
4adafcf 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132341 (Reject raw lifetime followed by `'`, like regular lifetimes do)
 - rust-lang#132363 (Enforce that raw lifetimes must be valid raw identifiers)
 - rust-lang#132744 (add regression test for rust-lang#90781)
 - rust-lang#132754 (Simplify the internal API for declaring command-line options)
 - rust-lang#132772 (use `download-rustc="if-unchanged"` as a global default)
 - rust-lang#132774 (Use lld with non-LLVM backends)
 - rust-lang#132799 (Make `Ty::primitive_symbol` recognize `str`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c435fa8 into rust-lang:master Nov 9, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 9, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 9, 2024
@rust-timer
Unrolled build for rust-lang#132772
3d1f6a3 
Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc-default, r=jieyouxu

use `download-rustc="if-unchanged"` as a global default

If `download-rustc` isn't explicitly set and the source is Git-managed, it should be totally okay to utilize "if-unchanged" behaviour. The "dist" profile already sets `download-rustc` to `false`, so this shouldn’t impact anything on CI.

This also resolves an unhandled case where `bootstrap` unexpectedly panics if `"if-unchanged"` was used with a non-Git source. Now we exits gracefully with an error message pointing the problem.
@onur-ozkan onur-ozkan deleted the download-rustc-default branch November 10, 2024 08:35
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 10, 2024
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Nov 10, 2024
@jieyouxu
Revert "Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc-…
5dbf135 
…default, r=jieyouxu"

This reverts commit c435fa8, reversing
changes made to 88acd49.

Seems to have unintentionally omitted commit hash leading to
<rust-lang#132772>.
@jieyouxu jieyouxu mentioned this pull request Nov 10, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2024
@bors
Auto merge of rust-lang#132846 - jieyouxu:revert-132772, r=RalfJung
00c8722 
Revert rust-lang#132772 to fix unknown git commit hash

Reverts rust-lang#132772 to address rust-lang#132845, we seem to have unintentionally omitted commit hash.

r? `@onur-ozkan`
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Nov 10, 2024
@jieyouxu
Revert "Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc-…
c0cee4e 
…default, r=jieyouxu"

This reverts commit c435fa8, reversing
changes made to 88acd49.

Seems to have unintentionally omitted commit hash leading to
<rust-lang#132772>.
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2024
@bors
Auto merge of rust-lang#132846 - jieyouxu:revert-132772, r=jieyouxu
c22887b 
Revert rust-lang#132772 to fix unknown git commit hash

Reverts rust-lang#132772 to address rust-lang#132845, we seem to have unintentionally omitted commit hash.

r? `@onur-ozkan`
onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Nov 10, 2024
@onur-ozkan
Reapply "Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc…
09bc03c 
…-default, r=jieyouxu"

This reverts commit c0cee4e.
@onur-ozkan onur-ozkan mentioned this pull request Nov 10, 2024
Merged
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@matthiaskrgr @mati865
Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc-default,…
605b671 
… r=jieyouxu

use `download-rustc="if-unchanged"` as a global default

If `download-rustc` isn't explicitly set and the source is Git-managed, it should be totally okay to utilize "if-unchanged" behaviour. The "dist" profile already sets `download-rustc` to `false`, so this shouldn’t impact anything on CI.

This also resolves an unhandled case where `bootstrap` unexpectedly panics if `"if-unchanged"` was used with a non-Git source. Now we exits gracefully with an error message pointing the problem.
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@bors @mati865
Auto merge of rust-lang#132815 - matthiaskrgr:rollup-nti992u, r=matth…
2496d2b 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132341 (Reject raw lifetime followed by `'`, like regular lifetimes do)
 - rust-lang#132363 (Enforce that raw lifetimes must be valid raw identifiers)
 - rust-lang#132744 (add regression test for rust-lang#90781)
 - rust-lang#132754 (Simplify the internal API for declaring command-line options)
 - rust-lang#132772 (use `download-rustc="if-unchanged"` as a global default)
 - rust-lang#132774 (Use lld with non-LLVM backends)
 - rust-lang#132799 (Make `Ty::primitive_symbol` recognize `str`)

r? `@ghost`
`@rustbot` modify labels: rollup
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@jieyouxu @mati865
Revert "Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc-…
0b07a7a 
…default, r=jieyouxu"

This reverts commit c435fa8, reversing
changes made to 88acd49.

Seems to have unintentionally omitted commit hash leading to
<rust-lang#132772>.
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@bors @mati865
Auto merge of rust-lang#132846 - jieyouxu:revert-132772, r=jieyouxu
b4f51b6 
Revert rust-lang#132772 to fix unknown git commit hash

Reverts rust-lang#132772 to address rust-lang#132845, we seem to have unintentionally omitted commit hash.

r? `@onur-ozkan`
onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Nov 13, 2024
@onur-ozkan
Reapply "Rollup merge of rust-lang#132772 - onur-ozkan:download-rustc…
1837f6f 
…-default, r=jieyouxu"

This reverts commit c0cee4e.
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@bors
Auto merge of rust-lang#132872 - onur-ozkan:reapply-132772, r=jieyouxu
65b3877 
Reland rust-lang#132772: use `download-rustc="if-unchanged"` as a global default

Relands rust-lang#132772 with the fix.

r? jieyouxu (knows the context).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

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.84.0
Development

Successfully merging this pull request may close these issues.
5 participants
@onur-ozkan @rustbot @rust-log-analyzer @jieyouxu @bors