Rust: backport Cargo.lock fixes for CI#19821
Merged
Conversation
321ae3f to
3be4173
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR backports fixes to preserve and track Cargo.lock in CI, updating related tests and cleanup logic.
- Update expected crate graph outputs to match the bumped
cfg_ifversion in the lock file. - Stop ignoring
Cargo.lockin the test.gitignoreso the lock file is tracked. - Remove the logic that deleted
Cargo.lockduring test setup inqltest.rs.
Reviewed Changes
Copilot reviewed 3 out of 43 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| rust/ql/test/extractor-tests/crate_graph/crates.expected | Bumped cfg_if version from 1.0.0 to 1.0.1 in expected output. |
| rust/ql/test/.gitignore | Removed Cargo.lock from ignore list to track the lock file. |
| rust/extractor/src/qltest.rs | Removed remove_file_if_exists helper and its invocation to stop deleting Cargo.lock. |
Comments suppressed due to low confidence (2)
rust/ql/test/.gitignore:2
- [nitpick] Add a comment above this block explaining that
Cargo.lockis intentionally tracked now for CI reproducibility.
lib.rs
rust/extractor/src/qltest.rs:62
- [nitpick] Consider adding a comment here to note why we no longer remove
Cargo.lock(to preserve the lock file for reproducible CI builds).
pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
navntoft
approved these changes
Jun 19, 2025
Contributor
navntoft
left a comment
There was a problem hiding this comment.
👍 assuming these commits are cherry-picked from the PRs that fixed CI on main.
Contributor
Author
we will see once CI passes here |
This file contains hidden or 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
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.
No description provided.