From 7984cdf57098a342bd5f5579840cee0397f694ed Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Sun, 16 Nov 2025 18:00:18 -0500
Subject: [PATCH] More workflow fixes

---
 .github/workflows/main.yml | 4 ++--
 .github/workflows/pr.yml   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4a8b26a3..dd5f9b57 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,8 +66,8 @@ jobs:
         run: |
           find app/build/outputs/apk -name '*.apk' -print0 |
             while IFS= read -r -d '' line; do
-              # Wholphin-debug-0.2.9-62-g5c12e03-16-arm64-v8a.apk => Wholphin-debug-arm64-v8a.apk
-              short_name="$(echo $line | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-fA-F0-9]+-[0-9]+//')"
+              # Wholphin-release-0.2.9-62-g5c12e03-16-arm64-v8a.apk => Wholphin-arm64-v8a.apk
+              short_name="$(echo $line | sed -E 's/-release-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-fA-F0-9]+-[0-9]+//')"
               echo "$line => $short_name"
               cp "$line" "$short_name"
             done
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5929d71d..178f8989 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -43,7 +43,7 @@ jobs:
         id: buildapp
         run: |
           ./gradlew clean assembleDebug
-          echo "apk=$(ls app/build/outputs/apk/debug/Wholphin-debug*.apk)" >> "$GITHUB_OUTPUT"
+          apks=$(find app/build/outputs/apk -name '*.apk' -print0 | tr '\0' ',' | sed 's/,$//')
       - name: Tar build dirs
         run: |
           tar -czf build.tgz ./app/.
@@ -55,6 +55,6 @@ jobs:
           if-no-files-found: error
       - uses: actions/upload-artifact@v5
         with:
-          name: Wholphin-debug.apk
-          path: "${{ steps.buildapp.outputs.apk }}"
+          name: APKs
+          path: "${{ steps.buildapp.outputs.apks }}"
           compression-level: 0