fix: build report — rootfs tar path prefix, git repo path
podman export creates paths without ./ prefix, but tar tf checks used ./etc/... which never matched. List once, grep without prefix. Also fix git commands to use $HOME/archy (workspace has no .git). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
d7286d5f63
commit
aa2a13d510
@ -253,7 +253,7 @@ jobs:
|
|||||||
echo "══════════════════════════════════════════"
|
echo "══════════════════════════════════════════"
|
||||||
echo "DEV ISO BUILD REPORT"
|
echo "DEV ISO BUILD REPORT"
|
||||||
echo "══════════════════════════════════════════"
|
echo "══════════════════════════════════════════"
|
||||||
echo "Commit: $(git rev-parse --short HEAD) ($(git log -1 --format=%s))"
|
echo "Commit: $(git -C "$HOME/archy" rev-parse --short HEAD 2>/dev/null || echo 'unknown') ($(git -C "$HOME/archy" log -1 --format=%s 2>/dev/null || echo 'unknown'))"
|
||||||
echo "Branch: ${GITHUB_REF_NAME:-dev-iso}"
|
echo "Branch: ${GITHUB_REF_NAME:-dev-iso}"
|
||||||
echo "Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC')"
|
echo "Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC')"
|
||||||
echo "Runner: $(hostname)"
|
echo "Runner: $(hostname)"
|
||||||
@ -266,11 +266,17 @@ jobs:
|
|||||||
ROOTFS=$(ls image-recipe/build/auto-installer/archipelago-rootfs.tar 2>/dev/null) || true
|
ROOTFS=$(ls image-recipe/build/auto-installer/archipelago-rootfs.tar 2>/dev/null) || true
|
||||||
if [ -n "$ROOTFS" ]; then
|
if [ -n "$ROOTFS" ]; then
|
||||||
echo " rootfs.tar: $(sudo du -h "$ROOTFS" 2>/dev/null | cut -f1 || echo 'unknown')"
|
echo " rootfs.tar: $(sudo du -h "$ROOTFS" 2>/dev/null | cut -f1 || echo 'unknown')"
|
||||||
echo " nginx config: $(sudo tar tf "$ROOTFS" ./etc/nginx/sites-available/archipelago 2>/dev/null && echo 'PRESENT' || echo 'MISSING')"
|
# List key paths once (podman export omits ./ prefix, so match without it)
|
||||||
echo " SSL cert: $(sudo tar tf "$ROOTFS" ./etc/archipelago/ssl/archipelago.crt 2>/dev/null && echo 'PRESENT' || echo 'MISSING')"
|
ROOTFS_LIST=$(sudo tar tf "$ROOTFS" 2>/dev/null | grep -E '(etc/nginx/sites-available/archipelago|etc/archipelago/ssl/archipelago.crt|usr/local/bin/archipelago-kiosk-launcher|usr/local/bin/archipelago|opt/archipelago/web-ui/index.html)' || true)
|
||||||
echo " kiosk launcher: $(sudo tar tf "$ROOTFS" ./usr/local/bin/archipelago-kiosk-launcher 2>/dev/null && echo 'PRESENT' || echo 'MISSING')"
|
for item in \
|
||||||
echo " backend binary: $(sudo tar tf "$ROOTFS" ./usr/local/bin/archipelago 2>/dev/null && echo 'PRESENT' || echo 'MISSING')"
|
"nginx config:etc/nginx/sites-available/archipelago" \
|
||||||
echo " web-ui index: $(sudo tar tf "$ROOTFS" ./opt/archipelago/web-ui/index.html 2>/dev/null && echo 'PRESENT' || echo 'MISSING')"
|
"SSL cert:etc/archipelago/ssl/archipelago.crt" \
|
||||||
|
"kiosk launcher:usr/local/bin/archipelago-kiosk-launcher" \
|
||||||
|
"backend binary:usr/local/bin/archipelago" \
|
||||||
|
"web-ui index:opt/archipelago/web-ui/index.html"; do
|
||||||
|
label="${item%%:*}"; path="${item#*:}"
|
||||||
|
echo "$ROOTFS_LIST" | grep -q "$path" && echo " $label: PRESENT" || echo " $label: MISSING"
|
||||||
|
done
|
||||||
else
|
else
|
||||||
echo " rootfs.tar not found in workspace"
|
echo " rootfs.tar not found in workspace"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user