Fix Cargo.lock issues and add --locked
in CI
#8369
Merged
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.
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.