Add Cargo.lock to generated files
#93
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
Without this, updating `Cargo.lock` in a way that is incompatible with the manifest files would not cause CI to fail, despite the use of the `--locked` option. My theory is that when `cargo-acap-build` is invoked, directly from the `Makefile` or indirectly via `cargo-acap-sdk`, it uses `cargo metadata` which updates the lockfile, causing later `cargo` invocations to succeed even when using the `--locked` option. Disproved theories include: - The `cargo install` commands in `install-venv.sh` update the lockfile (checking the diff immediately after this step reveals no diff) - Some other action, prior to `make check_all` update the lockfile (checking the diff immediately before this step reveals no diff) `Makefile`: - Use `cargo metadata` because it reconciles the lockfile without updating packages as `cargo update` would, and faster and with fewer side effects than something like `cargo build`. - Force the target to make sure it the lockfile is updated and the check works as intended, even if run before or without the other checks.
apljungquist
added a commit
that referenced
this pull request
Oct 15, 2024
…per_and_example * upstream/main: Update rust toolchain to 1.80.1 (#100) fix!: Make builds reproducible in dev-container (#99) feat(axevent)!: Use generic callbacks and remove leak (#59) fix: Install `cargo-acap-sdk` in venv (#97) chore: release cargo-acap-sdk 0.2.0 (#95) chore(deps): bump dirs from 3.0.2 to 5.0.1 (#85) Add `Cargo.lock` to generated files (#93) chore: Build apps with custom profile (#90) Remove leftover `dbg!` and copy `.eap` to appropriate names (#91) Use `cargo` with `--locked` option in checks (#92)
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.
Without this, updating
Cargo.lockin a way that is incompatible with the manifest files would not cause CI to fail, despite the use of the--lockedoption.My theory is that when
cargo-acap-buildis invoked, directly from theMakefileor indirectly viacargo-acap-sdk, it usescargo metadatawhich updates the lockfile, causing latercargoinvocations to succeed even when using the--lockedoption.Disproved theories include:
cargo installcommands ininstall-venv.shupdate the lockfile (checking the diff immediately after this step reveals no diff)make check_allupdate the lockfile (checking the diff immediately before this step reveals no diff)Makefile:cargo metadatabecause it reconciles the lockfile without updating packages ascargo updatewould, and faster and with fewer side effects than something likecargo build.