From 87644887726b0f96c0315663e123201bb7d6b0bb Mon Sep 17 00:00:00 2001 From: GF Date: Tue, 28 Jul 2026 21:29:11 -0400 Subject: [PATCH 1/2] test: refresh semver baseline fixture --- xtask/tests/command_orchestration.rs | 2 ++ xtask/tests/command_orchestration/support.rs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xtask/tests/command_orchestration.rs b/xtask/tests/command_orchestration.rs index 92cee8ab..abd5865c 100644 --- a/xtask/tests/command_orchestration.rs +++ b/xtask/tests/command_orchestration.rs @@ -135,6 +135,8 @@ fn release_critical_orchestrators_run_from_the_workspace_without_real_cargo() { assert!(log.contains("package -p j2k-core --list|")); assert!(log.contains("publish -p j2k-core --dry-run|")); assert!(log.contains("package -p j2k-cli --no-verify")); + assert!(log.contains("git rev-parse v0.7.5^{commit}")); + assert!(log.contains("git show v0.7.5:docs/stable-api-1.0.public-api.txt")); } fn assert_stable_api_fails_at_expected_boundary(output: &Output, context: &str) { diff --git a/xtask/tests/command_orchestration/support.rs b/xtask/tests/command_orchestration/support.rs index 0add820f..ba3b47ef 100644 --- a/xtask/tests/command_orchestration/support.rs +++ b/xtask/tests/command_orchestration/support.rs @@ -53,14 +53,14 @@ impl Harness { .expect("write fake cargo-machete"); make_executable(&cargo_machete, "fake cargo-machete"); let git = root.join("git"); - let baseline_snapshot = root.join("stable-api-0.7.3.public-api.txt"); + let baseline_snapshot = root.join("stable-api-0.7.5.public-api.txt"); fs::write(&baseline_snapshot, synthetic_baseline_snapshot()) .expect("write synthetic baseline API snapshot"); let real_git = find_program("git"); fs::write( &git, format!( - "#!/bin/sh\nprintf 'git %s\\n' \"$*\" >> '{}'\nif [ \"$1\" = status ]; then exit 0; fi\nif [ \"$1\" = config ] && [ \"$2\" = --get ] && [ \"$3\" = remote.origin.url ]; then printf '%s\\n' 'git@example.invalid:frames-sg/j2k.git'; exit 0; fi\nif [ \"$1\" = rev-parse ] && [ \"$2\" = 'v0.7.3^{{commit}}' ]; then printf '%s\\n' '494eebc3ef20895d331da86221b1d8c4bd4cabf8'; exit 0; fi\nif [ \"$1\" = show ] && [ \"$2\" = 'v0.7.3:docs/stable-api-1.0.public-api.txt' ]; then exec cat '{}'; fi\nexec \"{}\" \"$@\"\n", + "#!/bin/sh\nprintf 'git %s\\n' \"$*\" >> '{}'\nif [ \"$1\" = status ]; then exit 0; fi\nif [ \"$1\" = config ] && [ \"$2\" = --get ] && [ \"$3\" = remote.origin.url ]; then printf '%s\\n' 'git@example.invalid:frames-sg/j2k.git'; exit 0; fi\nif [ \"$1\" = rev-parse ] && [ \"$2\" = 'v0.7.5^{{commit}}' ]; then printf '%s\\n' 'a89abb6e7eba469c44b3735740712c2a85be0499'; exit 0; fi\nif [ \"$1\" = show ] && [ \"$2\" = 'v0.7.5:docs/stable-api-1.0.public-api.txt' ]; then exec cat '{}'; fi\nif [ \"$1\" = rev-parse ] && [ \"${{2#v}}\" != \"$2\" ]; then printf 'unexpected release revision: %s\\n' \"$2\" >&2; exit 97; fi\nif [ \"$1\" = show ] && [ \"${{2#v}}\" != \"$2\" ]; then printf 'unexpected release object: %s\\n' \"$2\" >&2; exit 97; fi\nexec \"{}\" \"$@\"\n", log.display(), baseline_snapshot.display(), real_git.display() @@ -279,6 +279,7 @@ fn synthetic_baseline_snapshot() -> String { "j2k-types", "j2k-cuda-runtime", "j2k-profile", + "j2k-ml", ] { writeln!( snapshot, From 335604a6163ac64dfc9b7bc6e475226308d6f304 Mon Sep 17 00:00:00 2001 From: GF Date: Tue, 28 Jul 2026 21:40:28 -0400 Subject: [PATCH 2/2] test: scope semver tag assertions to macos --- xtask/tests/command_orchestration.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xtask/tests/command_orchestration.rs b/xtask/tests/command_orchestration.rs index abd5865c..1574d447 100644 --- a/xtask/tests/command_orchestration.rs +++ b/xtask/tests/command_orchestration.rs @@ -135,8 +135,11 @@ fn release_critical_orchestrators_run_from_the_workspace_without_real_cargo() { assert!(log.contains("package -p j2k-core --list|")); assert!(log.contains("publish -p j2k-core --dry-run|")); assert!(log.contains("package -p j2k-cli --no-verify")); - assert!(log.contains("git rev-parse v0.7.5^{commit}")); - assert!(log.contains("git show v0.7.5:docs/stable-api-1.0.public-api.txt")); + #[cfg(target_os = "macos")] + { + assert!(log.contains("git rev-parse v0.7.5^{commit}")); + assert!(log.contains("git show v0.7.5:docs/stable-api-1.0.public-api.txt")); + } } fn assert_stable_api_fails_at_expected_boundary(output: &Output, context: &str) {