fix: Fix release channel detection #14598
Merged
Conversation
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
rustbot
added
the
S-waiting-on-review
|
It'd be great if someone can test whether #14549 works as intended with this patch. |
lowr
commented
Apr 17, 2023
| @@ -779,7 +779,7 @@ fn project_json_to_crate_graph( | |||
| CrateOrigin::Local { repo: None, name: None } | |||
| }, | |||
| target_layout.clone(), | |||
| None, | |||
| channel, | |||
| ); | |||
There was a problem hiding this comment.
I assumed not passing channel here is an oversight, or is it intentional?
|
Looks fine on
|
lowr
force-pushed
the
fix/release-channel-from-str
branch
from
2b5b0a4 to
eb5fea0
Compare
See bootstrap code in rust-lang/rust for versioning details: https://github.com/rust-lang/rust/blob/e49122fb1ca87a6c3e3c22abb315fc75cfe8daed/src/bootstrap/lib.rs#L1244
lowr
force-pushed
the
fix/release-channel-from-str
branch
from
eb5fea0 to
4db87f9
Compare
lnicola
approved these changes
Apr 17, 2023
|
@bors r=lnicola |
|
☀️ Test successful - checks-actions |
lnicola
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We detect toolchain's release channel by looking at pre-release identifier of cargo/rustc's version string. It's empty for stable, "beta" or "beta.x" for beta, and "nightly" for nightly.
See rust-lang/rust's bootstrap code for how the version string is determined.