From aa2a13d510019c245e06f449d30745e88aaed330 Mon Sep 17 00:00:00 2001 From: Dorian Date: Wed, 8 Apr 2026 16:00:53 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20build=20report=20=E2=80=94=20rootfs=20ta?= =?UTF-8?q?r=20path=20prefix,=20git=20repo=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .gitea/workflows/build-iso-dev.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-iso-dev.yml b/.gitea/workflows/build-iso-dev.yml index d717ca45..d3be48f0 100644 --- a/.gitea/workflows/build-iso-dev.yml +++ b/.gitea/workflows/build-iso-dev.yml @@ -253,7 +253,7 @@ jobs: echo "══════════════════════════════════════════" echo "DEV ISO BUILD REPORT" 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 "Date: $(date -u '+%Y-%m-%d %H:%M:%S UTC')" echo "Runner: $(hostname)" @@ -266,11 +266,17 @@ jobs: ROOTFS=$(ls image-recipe/build/auto-installer/archipelago-rootfs.tar 2>/dev/null) || true if [ -n "$ROOTFS" ]; then 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')" - echo " SSL cert: $(sudo tar tf "$ROOTFS" ./etc/archipelago/ssl/archipelago.crt 2>/dev/null && echo 'PRESENT' || echo 'MISSING')" - echo " kiosk launcher: $(sudo tar tf "$ROOTFS" ./usr/local/bin/archipelago-kiosk-launcher 2>/dev/null && echo 'PRESENT' || echo 'MISSING')" - echo " backend binary: $(sudo tar tf "$ROOTFS" ./usr/local/bin/archipelago 2>/dev/null && echo 'PRESENT' || echo 'MISSING')" - echo " web-ui index: $(sudo tar tf "$ROOTFS" ./opt/archipelago/web-ui/index.html 2>/dev/null && echo 'PRESENT' || echo 'MISSING')" + # List key paths once (podman export omits ./ prefix, so match without it) + 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) + for item in \ + "nginx config:etc/nginx/sites-available/archipelago" \ + "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 echo " rootfs.tar not found in workspace" fi