Skip to content

bootstrap: improve channel handling #139574

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Apr 11, 2025
Merged

bootstrap: improve channel handling #139574

merged 2 commits into from
Apr 11, 2025

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Apr 9, 2025 •
edited
Loading

Fixes #139569

See this comment for the explanation of this bug.

@rustbot
Copy link
Collaborator

rustbot commented Apr 9, 2025

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
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 Apr 9, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 9, 2025

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

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

This PR modifies src/bootstrap/defaults.

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

onur-ozkan
onur-ozkan commented Apr 9, 2025
View reviewed changes
@onur-ozkan onur-ozkan mentioned this pull request Apr 9, 2025
Closed
@onur-ozkan onur-ozkan force-pushed the better-channel-handling branch 2 times, most recently from f71219f to 07c0fbc Compare April 9, 2025 18:51
@onur-ozkan
set rust.channel to "auto-detect" for dist profile
9847c73 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan onur-ozkan force-pushed the better-channel-handling branch 3 times, most recently from 534d915 to 9b70334 Compare April 10, 2025 08:15
@onur-ozkan
handle config.channel default for tarballs
b1053fd 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan onur-ozkan force-pushed the better-channel-handling branch from 9b70334 to b1053fd Compare April 10, 2025 08:17
@Kobzol
Copy link
Contributor

Kobzol commented Apr 10, 2025

r? @Kobzol

That makes sense to me, although I still wonder if we should split the dist profile in the future, as it seems like it is too overloaded at the moment (CI vs tarball source builds).

Feel free to r=me unless you want to make further changes.

@rustbot rustbot assigned Kobzol and unassigned albertlarsan68 Apr 10, 2025
@onur-ozkan
Copy link
Member Author

That makes sense to me, although I still wonder if we should split the dist profile in the future, as it seems like it is too overloaded at the moment (CI vs tarball source builds).

I don't think creating a separate config for CI or tarballs would make much of a difference since there aren't many options defined in the "dist" profile. Besides, I think it's really good to keep the "dist" profile widely battle-tested.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 10, 2025

📌 Commit b1053fd has been approved by onur-ozkan

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 Apr 10, 2025
@Zalathar Zalathar mentioned this pull request Apr 11, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 11, 2025
@bors
Auto merge of rust-lang#139657 - Zalathar:rollup-6oh6f9q, r=Zalathar
18a029c 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#137447 (add `core::intrinsics::simd::{simd_extract_dyn, simd_insert_dyn}`)
 - rust-lang#138182 (rustc_target: update x86_win64 to match the documented calling convention for f128)
 - rust-lang#138682 (Allow drivers to supply a list of extra symbols to intern)
 - rust-lang#138904 (Test linking and running `no_std` binaries)
 - rust-lang#138998 (Don't suggest the use of  `impl Trait` in closure parameter)
 - rust-lang#139447 (doc changes: debug assertions -> overflow checks)
 - rust-lang#139469 (Introduce a `//@ needs-crate-type` compiletest directive)
 - rust-lang#139564 (Deeply normalize obligations in `BestObligation` folder)
 - rust-lang#139574 (bootstrap: improve `channel` handling)
 - rust-lang#139600 (Update `compiler-builtins` to 0.1.153)
 - rust-lang#139641 (Allow parenthesis around inferred array lengths)
 - rust-lang#139654 (Improve `AssocItem::descr`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fb7f0e4 into rust-lang:master Apr 11, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 11, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 11, 2025
@rust-timer
Unrolled build for rust-lang#139574
0fabbf3 
Rollup merge of rust-lang#139574 - onur-ozkan:better-channel-handling, r=onur-ozkan

bootstrap: improve `channel` handling

Fixes rust-lang#139569

See [this comment](rust-lang#139574 (comment)) for the explanation of this bug.
@onur-ozkan onur-ozkan deleted the better-channel-handling branch April 11, 2025 07:36
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Apr 14, 2025
@Zalathar
Rollup merge of #139574 - onur-ozkan:better-channel-handling, r=onur-…
6de146f 
…ozkan

bootstrap: improve `channel` handling

Fixes rust-lang/rust#139569

See [this comment](rust-lang/rust#139574 (comment)) for the explanation of this bug.
# for free to join this conversation on GitHub. Already have an account? # 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.88.0
Development

Successfully merging this pull request may close these issues.

Should miri be built by default with --enable-extended for realease tarballs?
5 participants
@onur-ozkan @rustbot @Kobzol @bors @albertlarsan68