-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fix Cargo.lock issues and add --locked
in CI
#8369
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM overall! One non-blocking nit.
"rustix 1.0.8", | ||
"windows-sys 0.61.0", | ||
"rustix 1.1.2", | ||
"windows-sys 0.52.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nitpick: This windows-sys
change seems like unnecessary churn, and dependent on what you were doing. AFAIK rustix
allows windows-sys
0.61.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to be a weird problem where cargo update sometimes resolves things differently on different... (platforms?) I'm not sure. I've seen this kind of thing a lot.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've seen it exclusively with windows-sys and one more windows related crate. really strange
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case, if I revert the windows-sys
change, cargo --locked
rejects the lockfile, so I'm going to leave the change, although it's certainly annoying.
There were some Cargo.lock inconsistencies due to changes that were tested/merged in parallel (I believe #8229 and #8263). This fixes them. It also adds
--locked
to CI to enforce better Cargo.lock hygiene. Note that doing so wouldn't have prevented this from happening, it just means that we would have noticed right away because the 2nd PR would have broken trunk.Testing
Build still works in CI.
Squash or Rebase? Rebase
Checklist
cargo fmt
.taplo format
.cargo clippy --tests
. If applicable, add:--target wasm32-unknown-unknown
cargo xtask test
to run tests.CHANGELOG.md
entry.