From fd452f601699b019bd7e14ed53f8ad14216d5e81 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Tue, 23 Jun 2026 23:18:36 +0400 Subject: ci: add acceptance artifact metadata --- fixtures/acceptance/coverage.tsv | 1 + fixtures/acceptance/stage_0_2_roadmap.md | 1 + xtask/src/main.rs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/fixtures/acceptance/coverage.tsv b/fixtures/acceptance/coverage.tsv index 458180c..cba6550 100644 --- a/fixtures/acceptance/coverage.tsv +++ b/fixtures/acceptance/coverage.tsv @@ -14,6 +14,7 @@ S0-ARCH-006 covered cargo xtask policy rejects non-fparkan package directories u S0-ARCH-007 covered cargo xtask ci runs fmt, policy, workspace test, clippy, rustdoc warnings, cargo-deny or built-in supply-chain fallback, and strict acceptance audit S0-ARCH-008 covered cargo xtask policy rejects moving Rust toolchains and workspace rust-version drift S0-ARCH-009 covered .github/workflows/ci.yml runs a pinned MSRV backend-neutral crate job +S0-ARCH-010 covered cargo xtask acceptance audit emits commit_sha, rust_toolchain, and msrv metadata into the JSON artifact S0-DIAG-001 covered cargo test -p fparkan-diagnostics --offline diagnostic_chain_preserves_context S0-DIAG-002 covered cargo test -p fparkan-diagnostics --offline json_is_stable S0-CORPUS-001 covered cargo test -p fparkan-corpus --offline deterministic_traversal_is_creation_order_independent diff --git a/fixtures/acceptance/stage_0_2_roadmap.md b/fixtures/acceptance/stage_0_2_roadmap.md index a710d09..60497d8 100644 --- a/fixtures/acceptance/stage_0_2_roadmap.md +++ b/fixtures/acceptance/stage_0_2_roadmap.md @@ -14,6 +14,7 @@ `S0-ARCH-007` `S0-ARCH-008` `S0-ARCH-009` +`S0-ARCH-010` `S0-DIAG-001` `S0-DIAG-002` `S0-CORPUS-001` diff --git a/xtask/src/main.rs b/xtask/src/main.rs index f932761..9128319 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1468,6 +1468,9 @@ impl CoverageStatus { #[derive(Clone, Debug, Eq, PartialEq)] struct AcceptanceAudit { + commit_sha: String, + rust_toolchain: String, + msrv: String, required_total: usize, covered: Vec, partial: Vec, @@ -1597,6 +1600,9 @@ fn build_acceptance_audit( .collect(); AcceptanceAudit { + commit_sha: current_git_commit_sha(), + rust_toolchain: PINNED_RUST_TOOLCHAIN.to_string(), + msrv: WORKSPACE_MSRV.to_string(), required_total: required.len(), covered, partial, @@ -1615,6 +1621,9 @@ fn render_audit_json(audit: &AcceptanceAudit) -> String { concat!( "{{\n", " \"schema_version\": \"fparkan-acceptance-coverage-v1\",\n", + " \"commit_sha\": \"{}\",\n", + " \"rust_toolchain\": \"{}\",\n", + " \"msrv\": \"{}\",\n", " \"required_total\": {},\n", " \"covered_total\": {},\n", " \"partial_total\": {},\n", @@ -1633,6 +1642,9 @@ fn render_audit_json(audit: &AcceptanceAudit) -> String { " \"coverage_evidence\": {}\n", "}}\n" ), + json_escape(&audit.commit_sha), + json_escape(&audit.rust_toolchain), + json_escape(&audit.msrv), audit.required_total, audit.covered.len(), audit.partial.len(), @@ -1652,6 +1664,18 @@ fn render_audit_json(audit: &AcceptanceAudit) -> String { ) } +fn current_git_commit_sha() -> String { + Command::new("git") + .args(["rev-parse", "HEAD"]) + .output() + .ok() + .filter(|output| output.status.success()) + .and_then(|output| String::from_utf8(output.stdout).ok()) + .map(|value| value.trim().to_string()) + .filter(|value| value.len() == 40 && value.chars().all(|ch| ch.is_ascii_hexdigit())) + .unwrap_or_else(|| "unknown".to_string()) +} + fn render_string_usize_map(values: &BTreeMap) -> String { let pairs = values .iter() @@ -1959,6 +1983,9 @@ mod tests { #[test] fn audit_json_escapes_evidence() { let mut audit = AcceptanceAudit { + commit_sha: "0123456789abcdef0123456789abcdef01234567".to_string(), + rust_toolchain: PINNED_RUST_TOOLCHAIN.to_string(), + msrv: WORKSPACE_MSRV.to_string(), required_total: 1, covered: vec!["S0-ARCH-001".to_string()], partial: Vec::new(), @@ -1976,6 +2003,9 @@ mod tests { let json = render_audit_json(&audit); assert!(json.contains("quoted \\\"value\\\"")); + assert!(json.contains("\"commit_sha\": \"0123456789abcdef0123456789abcdef01234567\"")); + assert!(json.contains("\"rust_toolchain\": \"1.87.0\"")); + assert!(json.contains("\"msrv\": \"1.87\"")); } #[test] -- cgit v1.2.3