Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rust: backport Cargo.lock fixes for CI #19821

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

Merged
merged 3 commits into from
Jun 19, 2025
Merged

Conversation

redsun82
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the Rust Pull requests that update Rust code label Jun 19, 2025
@redsun82 redsun82 changed the base branch from main to rc/3.18 June 19, 2025 14:22
@redsun82 redsun82 force-pushed the redsun82/backport-lock-fixes branch from 321ae3f to 3be4173 Compare June 19, 2025 14:39
@redsun82 redsun82 marked this pull request as ready for review June 19, 2025 14:40
@Copilot Copilot AI review requested due to automatic review settings June 19, 2025 14:40
@redsun82 redsun82 requested a review from a team as a code owner June 19, 2025 14:40
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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_if version in the lock file.
  • Stop ignoring Cargo.lock in the test .gitignore so the lock file is tracked.
  • Remove the logic that deleted Cargo.lock during test setup in qltest.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.lock is 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<()> {

Copy link

@navntoft navntoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 assuming these commits are cherry-picked from the PRs that fixed CI on main.

@redsun82
Copy link
Contributor Author

👍 assuming these commits are cherry-picked from the PRs that fixed CI on main.

we will see once CI passes here

@redsun82 redsun82 merged commit 246d769 into rc/3.18 Jun 19, 2025
14 checks passed
@redsun82 redsun82 deleted the redsun82/backport-lock-fixes branch June 19, 2025 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Rust Pull requests that update Rust code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants