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.

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

Set cargo --version git hash length to 9 #10579

Merged
merged 1 commit into from
Apr 20, 2022
Merged

Conversation

arlosi
Copy link
Contributor

@arlosi arlosi commented Apr 19, 2022

#10323 changed how cargo captures the current git commit hash, which resulted in platform-dependent commit hash lengths.
This change sets the length to 9, which is consistent with rustc and previous releases of cargo.

Fixes #10547

@rust-highfive
Copy link

r? @ehuss

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2022
@ehuss
Copy link
Contributor

ehuss commented Apr 20, 2022

Thanks! I'm still curious why different platforms would have different lengths.

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 20, 2022

📌 Commit 50ce641 has been approved by ehuss

@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 20, 2022
@bors
Copy link
Collaborator

bors commented Apr 20, 2022

⌛ Testing commit 50ce641 with merge 304a9e6...

@bors
Copy link
Collaborator

bors commented Apr 20, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 304a9e6 to master...

@bors bors merged commit 304a9e6 into rust-lang:master Apr 20, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 28, 2022
Update cargo

8 commits in edffc4ada3d77799e5a04eeafd9b2f843d29fc23..f63f23ff1f1a12ede8585bbd1bbf0c536e50293d
2022-04-19 17:38:29 +0000 to 2022-04-28 03:15:50 +0000
- move workspace inheritance untable docs to the correct place (rust-lang/cargo#10609)
- Cargo add support for workspace inheritance (rust-lang/cargo#10606)
- chore: Upgrade toml_edit (rust-lang/cargo#10603)
- Mark .cargo/git and .cargo/registry as cache dirs (rust-lang/cargo#10553)
- fix(yank): Use '--version' like install (rust-lang/cargo#10575)
- Disallow setting registry tokens with --config (rust-lang/cargo#10580)
- Set cargo --version git hash length to 9 (rust-lang/cargo#10579)
- Prefer `key.workspace = true` to `key = { workspace = true }` (rust-lang/cargo#10584)
@ehuss ehuss added this to the 1.62.0 milestone Apr 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cargo has different version commit hashes per platform
4 participants