From 6d165a39129c57b9d1385d2f446dd92136455b93 Mon Sep 17 00:00:00 2001
From: James Brechtel <git@jamesbrechtel.com>
Date: Fri, 15 May 2026 09:14:48 -0400
Subject: [PATCH] converge: auto-commit at 2026-05-15 09:14:48 from
 zendo.brechtel

---
 .gitea/workflows/build.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index b2dc084..3d469e4 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -45,7 +45,8 @@ jobs:
         run: |
           # Build the package inside an Arch Linux container.
           # Pipe workspace via stdin to avoid Docker-in-Docker volume mount issues.
-          # Output package via stdout as a tar to avoid capture conflicts.
+          # All build output goes to stderr (visible in logs); only the package
+          # tar goes to stdout so it can be captured cleanly.
           tar cf - --exclude=.stack-root --exclude=.stack-work . | \
             docker run --rm -i -w /build archlinux:latest bash -c "
               mkdir -p /build &&
@@ -57,7 +58,7 @@ jobs:
               chown -R build:build . &&
               runuser -u build -- makepkg --noconfirm --nodeps --nocheck >&2 &&
               tar cf /dev/stdout converge-*.pkg.tar.zst
-            " > /tmp/packages.tar 2>/dev/null
+            " > /tmp/packages.tar
           tar xf /tmp/packages.tar
           echo "pkgfile=$(ls converge-[0-9]*.pkg.tar.zst)" >> "$GITHUB_ENV"
 
@@ -66,26 +67,25 @@ jobs:
         env:
           SSH_AUTH_SOCK: /dev/null
         run: |
-          set -euo pipefail
-
           # Set up SSH
           mkdir -p "$HOME/.ssh"
           echo "${{ secrets.ARCH_REPO_SSH_KEY }}" > "$HOME/.ssh/id_ed25519"
           chmod 600 "$HOME/.ssh/id_ed25519"
-          ssh-keyscan -H "${{ secrets.ARCH_REPO_HOST }}" >> "$HOME/.ssh/known_hosts" 2>/dev/null
+          ssh-keyscan -H "${{ vars.ARCH_REPO_HOST }}" >> "$HOME/.ssh/known_hosts" 2>/dev/null
 
           PKGFILE="${{ env.pkgfile }}"
+          echo "Uploading $PKGFILE to ${{ vars.ARCH_REPO_HOST }}..."
 
           # Upload the package
-          scp -i "$HOME/.ssh/id_ed25519" \
+          scp -v -i "$HOME/.ssh/id_ed25519" \
             "$PKGFILE" \
-            "${{ secrets.ARCH_REPO_USER }}@${{ secrets.ARCH_REPO_HOST }}:${{ secrets.ARCH_REPO_PATH }}/"
+            "${{ vars.ARCH_REPO_USER }}@${{ vars.ARCH_REPO_HOST }}:${{ vars.ARCH_REPO_PATH }}/"
 
           # Add to repo database
-          ssh -i "$HOME/.ssh/id_ed25519" \
-            "${{ secrets.ARCH_REPO_USER }}@${{ secrets.ARCH_REPO_HOST }}" \
-            "cd '${{ secrets.ARCH_REPO_PATH }}' && \
-             repo-add '${{ secrets.ARCH_REPO_DB }}' '$PKGFILE' && \
+          ssh -v -i "$HOME/.ssh/id_ed25519" \
+            "${{ vars.ARCH_REPO_USER }}@${{ vars.ARCH_REPO_HOST }}" \
+            "cd '${{ vars.ARCH_REPO_PATH }}' && \
+             repo-add '${{ vars.ARCH_REPO_DB }}' '$PKGFILE' && \
              rm -f '$PKGFILE.old'"
 
       - name: Upload artifact