workflow-ghrelease: fix pkg filtering

Author: Encoded14

.github/workflows/build-releases.yaml

@@ -224,42 +224,50 @@ jobs:
             set -e
             export PATH="/opt/xbps/usr/bin/:$PATH"
 
+            # Only ship packages that have a template in this repo (no dependency-only packages)
+            OUR_PKGS=$(find ../../../extra/srcpkgs -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | sort -u | tr '\n' ' ')
+            echo "Only including packages with templates in repo: ${OUR_PKGS}"
+
             # 1. stash newly built packages away
             mkdir -p /tmp/newpkgs
             cp -v ./*.xbps /tmp/newpkgs/ 2>/dev/null || true
             cp -v ./*.xbps.sig /tmp/newpkgs/ 2>/dev/null || true
+            cp -v ./*.xbps.sig2 /tmp/newpkgs/ 2>/dev/null || true
 
-            # 2. use existing repo from release (fetched in previous step)
+            # 2. use existing repo from release: repodata, index, and only our template packages
             rm -f ./*
-
             if [ -d /tmp/oldrepo ] && [ -n "$(ls -A /tmp/oldrepo 2>/dev/null)" ]; then
-                cp -v /tmp/oldrepo/*.xbps . 2>/dev/null || true
-                cp -v /tmp/oldrepo/*.xbps.sig . 2>/dev/null || true
+                cp -v /tmp/oldrepo/*-repodata . 2>/dev/null || true
                 cp -v /tmp/oldrepo/index* . 2>/dev/null || true
+                for pkg in $OUR_PKGS; do
+                    cp -v /tmp/oldrepo/"${pkg}"-* . 2>/dev/null || true
+                done
             else
                 echo "No existing repo from release, starting fresh."
             fi
 
-            # 3. delete packages we just rebuilt successfully
+            # 3. delete packages we just rebuilt (so we can replace with new versions)
             for f in /tmp/newpkgs/*.xbps; do
                 [ -e "$f" ] || continue
                 base=$(basename "$f")
                 pkgname=$(printf "%s\n" "$base" | sed -E 's/-[0-9].*$//')
-                rm -f "${pkgname}-"*.xbps "${pkgname}-"*.xbps.sig 2>/dev/null || true
+                rm -f "${pkgname}-"*.xbps "${pkgname}-"*.xbps.sig "${pkgname}-"*.xbps.sig2 2>/dev/null || true
             done
 
             # 4. also delete packages for templates that were removed
             removed="${{ steps.changed.outputs.removed }}"
             if [ -n "$removed" ]; then
                 echo "==> removing packages for deleted templates..."
                 for pkg in $removed; do
-                    rm -f "${pkg}-"*.xbps "${pkg}-"*.xbps.sig 2>/dev/null || true
-                    rm -f "${pkg}.xbps" "${pkg}.xbps.sig" 2>/dev/null || true
+                    rm -f "${pkg}-"*.xbps "${pkg}-"*.xbps.sig "${pkg}-"*.xbps.sig2 2>/dev/null || true
+                    rm -f "${pkg}.xbps" "${pkg}.xbps.sig" "${pkg}.xbps.sig2" 2>/dev/null || true
                 done
             fi
 
-            # 5. copy the newly built packages back in
-            cp -v /tmp/newpkgs/* . 2>/dev/null || true
+            # 5. copy back only our newly built packages (exclude dependency-only packages)
+            for pkg in $OUR_PKGS; do
+                cp -v /tmp/newpkgs/"${pkg}"-* . 2>/dev/null || true
+            done
 
             # 6. sign + reindex
             printf "%s\n" "$PRIV_KEY" > private.pem