Fix version json tests to work outside git checkout#13566
Merged
Gankra merged 6 commits intoastral-sh:mainfrom May 21, 2025
Merged
Fix version json tests to work outside git checkout#13566Gankra merged 6 commits intoastral-sh:mainfrom
Gankra merged 6 commits intoastral-sh:mainfrom
Conversation
Fix the two version json tests to account for the possibility that uv was built outside a git checkout (e.g. from an unpacked git archive) and therefore does not have the commit info available. This approach uses separate snapshots for the two cases, as suggested in discussion of pull request astral-sh#13251. Fixes astral-sh#13212
Gankra
approved these changes
May 21, 2025
Contributor
Gankra
left a comment
There was a problem hiding this comment.
Oh geez, apologies, finishing this work slipped through the cracks!
crates/uv/build.rs
Outdated
Comment on lines
+18
to
+23
| fn has_git(workspace_root: &Path) { | ||
| let git_dir = workspace_root.join(".git"); | ||
| if git_dir.exists() { | ||
| println!("cargo:rustc-env=UV_TEST_HAS_COMMIT_HASH=1"); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Doing this in a build.rs seems like an extremely heavy hammer that might mess up build caching -- can we just do this .git check in the tests themselves?
Contributor
Author
There was a problem hiding this comment.
I suppose so, but I have no clue how to get the right path :-). I should probably mention I don't really know Cargo/Rust, and I'm just bashing things randomly until they work.
Contributor
There was a problem hiding this comment.
Ah ok no prob, I'll take a quick crack at it :)
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
2 participants
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.
Summary
Fix the two version json tests to account for the possibility that uv was built outside a git checkout (e.g. from an unpacked git archive) and therefore does not have the commit info available. This approach uses separate snapshots for the two cases, as suggested in discussion of pull request #13251.
Fixes #13212
Test Plan
cargo testin a git clone.cargo clean, moved.gitaway,cargo testagain.