From 57f4ff9b1ecc2e10d7b812f0df1fb835f098877a Mon Sep 17 00:00:00 2001
From: Jorijn van der Graaf <jorijnvdgraaf@catcrafts.net>
Date: Sat, 31 Oct 2026 20:49:53 +0100
Subject: [PATCH] build.yml: publish the kernel apk last

The publish step uploads one apk at a time, in glob order, and stops at
the first failed upload. With the kernel apk before soc-fairphone-fp6-audio
in that order, a failure in between would leave the registry serving a
kernel without the package that carries its card name's topology and UCM
(the combined-stable tip CI builds names the card MILOS-Fairphone-Gen6
since 7.3; only soc-fairphone-fp6-audio >= 5 has those files, and without
them that kernel boots with no sound card). Upload everything else first,
the kernel last.
---
 .forgejo/workflows/build.yml | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index c5eccf6..ae0387c 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -73,21 +73,33 @@ jobs:
           fi
           apk add -q curl
           found=0
-          for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/*.apk; do
-            [ -e "$f" ] || continue
-            case "$(basename "$f")" in
-              imsd-*|fingerprintd-*) echo "registry-sourced, not republished: $(basename "$f")"; continue ;;
-              libqmi-*|qmi-utils-*) echo "retired fork, not republished: $(basename "$f")"; continue ;;
+          publish() {
+            case "$(basename "$1")" in
+              imsd-*|fingerprintd-*) echo "registry-sourced, not republished: $(basename "$1")"; return 0 ;;
+              libqmi-*|qmi-utils-*) echo "retired fork, not republished: $(basename "$1")"; return 0 ;;
             esac
             found=1
             code=$(curl -s -o /dev/null -w '%{http_code}' \
-              --user "catbot:$PACKAGE_TOKEN" --upload-file "$f" \
+              --user "catbot:$PACKAGE_TOKEN" --upload-file "$1" \
               "https://forgejo.catcrafts.net/api/packages/Catcrafts/alpine/edge/fp6")
             case "$code" in
-              201) echo "published: $(basename "$f")" ;;
-              409) echo "already published: $(basename "$f")" ;;
-              *)   echo "FAILED ($code): $(basename "$f")"; exit 1 ;;
+              201) echo "published: $(basename "$1")" ;;
+              409) echo "already published: $(basename "$1")" ;;
+              *)   echo "FAILED ($code): $(basename "$1")"; exit 1 ;;
             esac
+          }
+          # The kernel goes last: a publish that fails part-way (the first
+          # failed upload ends this step) must never leave the registry serving
+          # a kernel without the userspace its card name needs - the 7.3 kernel
+          # has its topology and UCM only in soc-fairphone-fp6-audio >= 5.
+          for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/*.apk; do
+            [ -e "$f" ] || continue
+            case "$(basename "$f")" in linux-postmarketos-qcom-milos-*) continue ;; esac
+            publish "$f"
+          done
+          for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/linux-postmarketos-qcom-milos-*.apk; do
+            [ -e "$f" ] || continue
+            publish "$f"
           done
           [ "$found" = 1 ] || { echo "no packages found to publish"; exit 1; }