Skip to content

#664 sync scylla Cargo.lock with Cargo.toml#665

Merged
bracyw merged 3 commits into
developfrom
664-scylla-cargo-lock-out-of-sync
Jun 20, 2026
Merged

#664 sync scylla Cargo.lock with Cargo.toml#665
bracyw merged 3 commits into
developfrom
664-scylla-cargo-lock-out-of-sync

Conversation

@bracyw

@bracyw bracyw commented Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Changes

Two changes:

Syncs scylla-server Cargo.lock with Cargo.toml by adding the headers v0.4.1 and headers-core v0.3.0 entries that axum-extra's typed-header feature requires. The committed lock was missing them, so the manual scylla docker image workflow, which builds with cargo build --release --locked, aborted with exit 101 (arm64 hit the lock error directly; amd64 hit a transient index-fetch reset during the same forced re-resolution). Minimal sync: 25 insertions, no version change to any existing crate.

Adds --locked to every cargo command in Scylla CI (clippy, build, run, test) so future lock drift fails on every PR rather than only on the manual docker build, which was the gap that let this drift reach develop.

Notes

Regular Scylla CI previously built without --locked, so it silently regenerated the lock in memory and stayed green; only the --locked docker build surfaced the drift. The CI change closes that gap, and this PR's own Scylla CI run now self-verifies the lock is in sync.

Test Cases

  • Resolving the lock with the locked flag (cargo metadata --locked) now succeeds, where it previously exited 101.
  • Manual "Create and publish scylla docker image" workflow run on this branch: green on amd64, arm64, and the multi-arch manifest.
  • Scylla CI on this PR runs every cargo step with --locked and passes, confirming the lockfile matches the manifest.

Checklist

  • All commits are tagged with the ticket number
  • No linting errors / newline at end of file warnings
  • No merge conflicts
  • All checks passing
  • Remove any non-applicable sections of this template
  • Assign the PR to yourself
  • No package-lock.json changes (unless dependencies have changed)
  • PR is linked to the ticket (fill in the closes line below)

Closes #664

@bracyw bracyw self-assigned this Jun 15, 2026
@bracyw bracyw marked this pull request as ready for review June 15, 2026 03:23
@bracyw bracyw requested a review from TheJeffreyKuo June 15, 2026 03:23
@bracyw bracyw merged commit b330c20 into develop Jun 20, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fix scylla docker image build: Cargo.lock out of sync with Cargo.toml

1 participant