archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

chore(cts): Fix parsing of Git for Windows version string

Browse Source 
Git for Windows adds an extra suffix to the version string. This is a
follow up to #7800 that ensures we parse such git versions correctly
rather than returning an error.
This commit is contained in:
Jamie Nicol 2025-06-17 09:37:49 +01:00 committed by Erich Gubler
parent 45ebc73610
commit aeb2c3e6c7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xtask/src/cts.rs
View File

@ -161,6 +161,12 @@ fn parse_git_version_output(output: &str) -> anyhow::Result<GitVersion> {
let raw_version = raw_version.trim_end(); // There should always be a newline at the end, but
// we don't care if it's missing.
// Git for Windows suffixes the version with ".windows.<n>".
// Strip it if present.
let raw_version = raw_version
.split_once(".windows")
.map_or(raw_version, |(before, _after)| before);
let parsed = GitVersion::try_from(
raw_version
.splitn(3, '.')
@ -189,6 +195,7 @@ fn test_git_version_parsing() {
test_ok!("git version 2.3.0", [2, 3, 0]);
test_ok!("git version 0.255.0", [0, 255, 0]);
test_ok!("git version 4.5.6", [4, 5, 6]);
test_ok!("git version 2.3.0.windows.1", [2, 3, 0]);
macro_rules! test_err {
($input:expr, $msg:expr) => {