From 3418d46c118f625aeee10643f12fcd4a3e6eee49 Mon Sep 17 00:00:00 2001 From: Jer Miller Date: Thu, 20 Aug 2026 12:43:41 -0600 Subject: [PATCH] Package the attention and offline status dests. The glob inventory pin went red when those dests landed without matching package rows. Keep dests, inventories, and the count pin as one set of six. --- crates/rust-release-manifest/src/package_audit.rs | 10 +++++++++- crates/rust-release-manifest/src/tests.rs | 2 +- crates/solstone-linux/Cargo.toml | 4 ++++ crates/solstone-linux/src/release_rail_tests.rs | 6 +++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/crates/rust-release-manifest/src/package_audit.rs b/crates/rust-release-manifest/src/package_audit.rs index 57bcca2..73ed6e4 100644 --- a/crates/rust-release-manifest/src/package_audit.rs +++ b/crates/rust-release-manifest/src/package_audit.rs @@ -69,7 +69,7 @@ pub(crate) struct PayloadAuthority { pub(crate) role: PayloadRole, } -pub(crate) const PAYLOAD_AUTHORITY: [PayloadAuthority; 16] = [ +pub(crate) const PAYLOAD_AUTHORITY: [PayloadAuthority; 18] = [ PayloadAuthority { source: "target/release/solstone-linux", installed: "/usr/bin/solstone-linux", @@ -140,6 +140,14 @@ pub(crate) const PAYLOAD_AUTHORITY: [PayloadAuthority; 16] = [ "contrib/icons/hicolor/scalable/status/solstone-syncing.svg", "/usr/share/icons/hicolor/scalable/status/solstone-syncing.svg", ), + icon( + "contrib/icons/hicolor/scalable/status/solstone-attention.svg", + "/usr/share/icons/hicolor/scalable/status/solstone-attention.svg", + ), + icon( + "contrib/icons/hicolor/scalable/status/solstone-offline.svg", + "/usr/share/icons/hicolor/scalable/status/solstone-offline.svg", + ), ]; const fn icon(source: &'static str, installed: &'static str) -> PayloadAuthority { diff --git a/crates/rust-release-manifest/src/tests.rs b/crates/rust-release-manifest/src/tests.rs index fe730c6..4785b74 100644 --- a/crates/rust-release-manifest/src/tests.rs +++ b/crates/rust-release-manifest/src/tests.rs @@ -396,7 +396,7 @@ fn package_payload_authority_matches_both_manifest_dialects() { .collect::>(); assert_eq!(deb, rpm); assert_eq!(deb, expected); - assert_eq!(expected.len(), 16); + assert_eq!(expected.len(), 18); } fn audit_fixture_bytes( diff --git a/crates/solstone-linux/Cargo.toml b/crates/solstone-linux/Cargo.toml index a80e0cb..6934510 100644 --- a/crates/solstone-linux/Cargo.toml +++ b/crates/solstone-linux/Cargo.toml @@ -85,6 +85,8 @@ assets = [ ["../../contrib/icons/hicolor/scalable/status/solstone-paused.svg", "usr/share/icons/hicolor/scalable/status/solstone-paused.svg", "644"], ["../../contrib/icons/hicolor/scalable/status/solstone-recording.svg", "usr/share/icons/hicolor/scalable/status/solstone-recording.svg", "644"], ["../../contrib/icons/hicolor/scalable/status/solstone-syncing.svg", "usr/share/icons/hicolor/scalable/status/solstone-syncing.svg", "644"], + ["../../contrib/icons/hicolor/scalable/status/solstone-attention.svg", "usr/share/icons/hicolor/scalable/status/solstone-attention.svg", "644"], + ["../../contrib/icons/hicolor/scalable/status/solstone-offline.svg", "usr/share/icons/hicolor/scalable/status/solstone-offline.svg", "644"], ] # cargo-generate-rpm resolves sources from build-release.sh's workspace-root CWD @@ -109,4 +111,6 @@ assets = [ { source = "contrib/icons/hicolor/scalable/status/solstone-paused.svg", dest = "/usr/share/icons/hicolor/scalable/status/solstone-paused.svg", mode = "644" }, { source = "contrib/icons/hicolor/scalable/status/solstone-recording.svg", dest = "/usr/share/icons/hicolor/scalable/status/solstone-recording.svg", mode = "644" }, { source = "contrib/icons/hicolor/scalable/status/solstone-syncing.svg", dest = "/usr/share/icons/hicolor/scalable/status/solstone-syncing.svg", mode = "644" }, + { source = "contrib/icons/hicolor/scalable/status/solstone-attention.svg", dest = "/usr/share/icons/hicolor/scalable/status/solstone-attention.svg", mode = "644" }, + { source = "contrib/icons/hicolor/scalable/status/solstone-offline.svg", dest = "/usr/share/icons/hicolor/scalable/status/solstone-offline.svg", mode = "644" }, ] diff --git a/crates/solstone-linux/src/release_rail_tests.rs b/crates/solstone-linux/src/release_rail_tests.rs index 43a1f48..8d6b015 100644 --- a/crates/solstone-linux/src/release_rail_tests.rs +++ b/crates/solstone-linux/src/release_rail_tests.rs @@ -179,12 +179,12 @@ fn container_context_excludes_host_outputs() { fn package_assets_exist_and_match() { let (_, member) = metadata(); let expected = committed_asset_set(); - assert_eq!(expected.len(), 15, "LICENSE + INSTALL-NOTES + 13 icons"); + assert_eq!(expected.len(), 17, "LICENSE + INSTALL-NOTES + 15 icons"); let deb = deb_assets(&member); let rpm = rpm_assets(&member); - assert_eq!(deb.len(), 16); - assert_eq!(rpm.len(), 16); + assert_eq!(deb.len(), 18); + assert_eq!(rpm.len(), 18); assert_eq!(deb[0].0, "target/release/solstone-linux"); assert_eq!(rpm[0].0, "target/release/solstone-linux"); assert_eq!(deb[0].2, "755"); -- 2.51.2