Sync cargo-the-cli version with rustc. #10178
Merged
Conversation
This file contains 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
This field is no longer being used, as pre-release versions have not been used in cargo for quite some time, and I don't anticipate them ever returning.
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
weihanglo
approved these changes
Dec 7, 2021
There was a problem hiding this comment.
Looks great!
Just wonder is there any documentation for env like CFG_RELEASE? I can find them in rustc source code but not in docs 😞.
|
Those |
Eh2406
approved these changes
Dec 10, 2021
There was a problem hiding this comment.
I think this will make things less confusing for our users. So I'm giving it an approval.
I'm a little worried that this will make it harder to diagnose issues if somehow the rustc release process has a bug and includes the wrong version of cargo.
So I will leave it up to @alexcrichton
|
@bors: r+ Indeed looks good to me! |
|
📌 Commit a58725a has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 15, 2021
Update cargo 14 commits in 40dc281755137ee804bc9b3b08e782773b726e44..a359ce16073401f28b84840da85b268aa3d37c88 2021-12-06 21:54:44 +0000 to 2021-12-14 18:40:22 +0000 - Support `term.quiet` configuration (rust-lang/cargo#10152) - Display alias target on 'cargo help <alias>` (rust-lang/cargo#10193) - delete --host command and message (rust-lang/cargo#10145) - Improve I/O error message for fingerprint of build script (rust-lang/cargo#10191) - Explicitly mark aliases in `cargo list`. (rust-lang/cargo#10177) - Don't emit "executable" JSON field for non-executables. (rust-lang/cargo#10171) - Move scrape-examples docs to correct section. (rust-lang/cargo#10166) - Do not suggest source config if nothing to vendor (rust-lang/cargo#10161) - Bump versions of local deps. (rust-lang/cargo#10155) - Bump to 0.60.0, update changelog (rust-lang/cargo#10154) - Fix some profile documentation. (rust-lang/cargo#10153) - Document lib before bin. (rust-lang/cargo#10172) - Sync cargo-the-cli version with rustc. (rust-lang/cargo#10178) - Remove `-Z future-incompat-report` from message displayed to user (rust-lang/cargo#10185)
This was referenced Jan 20, 2022
bors
added a commit
that referenced
this pull request
Jan 25, 2022
Use local git info for version. #10178 caused an unintended change where cargo is being built twice in rust-lang/rust's CI. It is being built once as a CLI, and a second time for RLS. The cause is the `CFG_COMMIT_HASH` environment variable changes between those two builds (it is set for the tool being built). The solution here is to grab the git information from cargo's own build script. This is guaranteed to always be in the `src/tools/cargo` directory for both tools. This should help save a minute or two in the dist builders.
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.
People occasionally get confused when cargo's version does not match the version of rustc. This happens in a variety of scenarios:
This changes it so that cargo-the-cli will always report the same version as rustc (assuming they were built with rustbuild). The git information remains the same (reports cargo's last commit sha).
Closes #10122