fix(ublue-builder): ensure that skipped architectures do not fail on CI

.github/workflows/build-package.yml

@@ -81,13 +81,21 @@ jobs:
           mkdir -p containers
           MOCK_DIR=./mock
           CONTAINERS_DIR=./containers
+          SOURCES_DIR=.
           export CONTAINERS_DIR
           $just build ${{ matrix.spec }} -r ${{ matrix.chroot }}-$(arch)
+          SKIPPED_ARCH=false
+          if [ -e "$SOURCES_DIR/arch_skipped" ] ; then
+            SKIPPED_ARCH=true
+          fi
+          sudo chown -R $(id -u):$(id -g) $MOCK_DIR
           echo "mock_dir=$MOCK_DIR" >> "$GITHUB_OUTPUT"
           echo "containers_dir=$CONTAINERS_DIR" >> "$GITHUB_OUTPUT"
-          sudo chown -R $(id -u):$(id -g) $MOCK_DIR
+          echo "sources_dir=$SOURCES_DIR" >> "$GITHUB_OUTPUT"
+          echo "skipped_arch=$SKIPPED_ARCH" >> "$GITHUB_OUTPUT"
 
       - name: Upload to Job Artifacts
+        if: steps.build_package.outputs.skipped_arch == 'false'
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
         with:
           name: ${{ matrix.chroot }}-${{ matrix.platform }}-rpms

.gitignore

@@ -2,3 +2,4 @@ output/
 mock/
 rpmbuild/
 brew-out/
+arch_skipped

Justfile

@@ -23,10 +23,11 @@ build $spec *MOCK_ARGS:
     # Mock also needs to be called unprivileged apparently
     CONTAINERS_DIR="${CONTAINERS_DIR:-/var/lib/containers}"
     MOCK_DIR="${MOCK_DIRECTORY:-./mock}"
+    SOURCES_DIR="${SOURCES_DIR:-.}"
     sudo podman run --privileged --rm -it \
         -v "$CONTAINERS_DIR:/var/lib/containers:z" \
         -v "$MOCK_DIR:/var/lib/mock:Z" \
-        -v .:/tmp/sources:Z \
+        -v "$SOURCES_DIR:/tmp/sources:Z" \
         -w /tmp/sources \
         --user "$(id -u):$(id -g)" \
         -e PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin,HOME=/tmp \

ublue-builder/mock-wrapper

@@ -26,7 +26,8 @@ OUTDIR="$(mktemp -d)"
 SPEC_PATH="$(realpath "$(dirname "$SPEC_FILE")")"
 rpkg --path "${SPEC_PATH}" spec --outdir "$OUTDIR"
 if ! rpmspec -P "${OUTDIR}"/*.spec | grep "ExclusiveArch:" | grep "$(arch)" ; then
-  echo "Arch Skipped" && exit 0
+  echo "Arch Skipped" | tee /tmp/sources/arch_skipped
+  exit 0
 fi
 group_end