Support rust.channel = "auto-detect"#137220
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 28, 2025
Merged
Conversation
Collaborator
rustbot
added
S-waiting-on-review
Collaborator
|
This PR modifies If appropriate, please update This PR modifies If appropriate, please update |
emilyalbini
changed the title
rust.channel = "ci"
Member
|
Two (non-blocking) nits:
|
Collaborator
|
☔ The latest upstream changes (presumably #137215) made this pull request unmergeable. Please resolve the merge conflicts. |
emilyalbini
force-pushed
the
pa-channel-ci
branch
from
1c5aac9 to
1ccff0e
Compare
emilyalbini
changed the title
rust.channel = "ci"rust.channel = "auto-detect"
Member
Author
|
Updated the PR. Ended up choosing |
Member
|
This is a great name. Thanks! @bors r+ |
Collaborator
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened. |
bors
added
S-waiting-on-bors
Member
|
@bors rollup |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 28, 2025
Rollup of 9 pull requests Successful merges: - rust-lang#136424 (fix: overflowing bin hex) - rust-lang#136824 (solver cycles are coinductive once they have one coinductive step) - rust-lang#137220 (Support `rust.channel = "auto-detect"`) - rust-lang#137712 (Clean up TypeckResults::extract_binding_mode) - rust-lang#137713 (Fix enzyme build errors) - rust-lang#137748 (Fix method name in `TyCtxt::hir_crate()` documentation) - rust-lang#137778 (update enzyme to handle range metadata) - rust-lang#137780 (Fix typo in query expansion documentation) - rust-lang#137788 (Bump `rustc_{codegen_ssa,llvm}` `cc` to 1.2.16 to fix `x86` Windows jobs on newest Windows SDK) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 28, 2025
Rollup merge of rust-lang#137220 - ferrocene:pa-channel-ci, r=Kobzol Support `rust.channel = "auto-detect"` As [discussed in Zulip](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/vibe.20check.20for.20a.20few.20config.20changes), this PR adds the new `"auto-detect"` value for `rust.channel`, to load the channel name from `src/ci/channel`. Note that in a previous iteration of this PR the value was "ci" instead of "auto-detect".
bors-ferrocene bot
added a commit
to ferrocene/ferrocene
that referenced
this pull request
Mar 12, 2025
1360: Move most of `configure.sh` to a bootstrap profile r=pietroalbini a=pietroalbini Note: currently a draft as I needed to cherry-pick rust-lang/rust#137220 (it hasn't reached Ferrocene yet). This PR moves most of the configuration for our CI away from `configure.sh` and into a bootstrap profile. With this change, all of the configuration about how a Ferrocene build should look like will reside in the profile, and `configure.sh` will only contain settings specific to our CI environment. I also made a few changes: * Added `ferrocene.channel = "auto-detect"` to load the channel from `ferrocene/ci/channel`. Before we were loading the contents of the file in the bash script, but that's not possible anymore. This mirrors the change we upstreamed in rust-lang/rust#137220. * Added `FERROCENE_TEST_OUTCOMES_DIR` to load the test outcomes from a directory. Before this was done through the `RUST_CONFIGURE_ARGS`, but it was the only use of that environment variable. Adding `FERROCENE_TEST_OUTCOMES_DIR` removes the need to have `RUST_CONFIGURE_ARGS`. For our CI nothing will change! For our developers trying to reproduce CI failures locally, they will be able to set `profile = "ferrocene-dist"` at the top of their `config.toml` instead of running `configure.sh`. Note that this is not the recommended configuration to keep locally, the previous guidance of "don't use `configure.sh` day-to-day" applies to this profile as well. For third parties building Ferrocene on their systems, instead of running `configure.sh` with the `OUTSIDE_FERROUS=1` environment variable, they'll be able to invoke `./configure --set profile=ferrocene-dist $their_flags_there`. Co-authored-by: Pietro Albini <pietro.albini@ferrous-systems.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As discussed in Zulip, this PR adds the new
"auto-detect"value forrust.channel, to load the channel name fromsrc/ci/channel.Note that in a previous iteration of this PR the value was "ci" instead of "auto-detect".