diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 316464544..617fa6ce4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,6 +30,7 @@ jobs:
             echo "ccache not found in container; installing."
             apt-get update -qq
             DEBIAN_FRONTEND=noninteractive apt-get install -y -qq ccache
+            command -v ccache >/dev/null 2>&1
           fi
 
       - name: Mark workspace safe
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 32e840d4b..485d8199e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -74,17 +74,20 @@ jobs:
           zip_add_unique() {
             local target_name
             target_name="$(basename "$1")"
-            if [ -f eqemu-server-linux-x64.zip ] && unzip -Z1 eqemu-server-linux-x64.zip | grep -qx "$target_name"; then
+            if [ -f eqemu-server-linux-x64.zip ] && printf '%s\n' "$ZIP_CONTENTS" | grep -qx "$target_name"; then
               echo "Skipping duplicate library: $target_name"
               return 0
             fi
             zip_add "$1"
+            ZIP_CONTENTS="${ZIP_CONTENTS}${target_name}"$'\n'
           }
 
           # Add all executable files (excluding tests)
+          ZIP_CONTENTS="$(unzip -Z1 eqemu-server-linux-x64.zip 2>/dev/null || true)"
           for f in *; do
             if [ -f "$f" ] && [ -x "$f" ] && [ "$f" != "tests" ]; then
               zip_add "$f"
+              ZIP_CONTENTS="${ZIP_CONTENTS}${f}"$'\n'
             fi
           done