Skip to content

Commit 3630377

Browse files
committed
fix(ci+inventory): normalize tar checks and ensure host-info emits JSON header
1 parent 2c363f9 commit 3630377

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/static.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ jobs:
6666
# Verify tarball contains required libs (avoid SIGPIPE under pipefail)
6767
tmp_tar_list=$(mktemp)
6868
tar -tf "$ver_tar" > "$tmp_tar_list"
69-
grep -Fxq 'Scripts/lib/solen.sh' "$tmp_tar_list"
70-
grep -Fxq 'Scripts/lib/edit.sh' "$tmp_tar_list"
71-
grep -Fxq 'Scripts/lib/pm.sh' "$tmp_tar_list"
72-
grep -Fxq 'Scripts/lib/policy.sh' "$tmp_tar_list"
69+
# Normalize './' prefix if present so checks are robust across tar variants
70+
sed -e 's#^\./##' "$tmp_tar_list" > "$tmp_tar_list.norm"
71+
grep -Fxq 'Scripts/lib/solen.sh' "$tmp_tar_list.norm"
72+
grep -Fxq 'Scripts/lib/edit.sh' "$tmp_tar_list.norm"
73+
grep -Fxq 'Scripts/lib/pm.sh' "$tmp_tar_list.norm"
74+
grep -Fxq 'Scripts/lib/policy.sh' "$tmp_tar_list.norm"
7375
rm -f "$tmp_tar_list"
7476
# Create channel pointers and legacy latest name
7577
cp -f "$ver_tar" site/releases/solen-stable.tar.gz

Scripts/inventory/host-info.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,7 @@ else
125125
solen_ok "inventory complete"
126126
fi
127127
exit 0
128-
128+
if [[ ${SOLEN_FLAG_JSON:-0} -eq 1 ]]; then
129+
# Emit an initial JSON record so validators see JSON immediately
130+
solen_json_record ok "begin: inventory" "" ""
131+
fi

0 commit comments

Comments
 (0)