From 96c5d0fca841f82cc1c53fc5200c40aa56d910b5 Mon Sep 17 00:00:00 2001
From: eddyizm <eddyizm@gmail.com>
Date: Thu, 16 Oct 2025 21:54:53 -0700
Subject: [PATCH] fix: updated workflow for 32/64 bit apks

---
 .github/workflows/github_release.yml | 72 ++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
index d026f23a..b452576c 100644
--- a/.github/workflows/github_release.yml
+++ b/.github/workflows/github_release.yml
@@ -45,7 +45,7 @@ jobs:
           bash ./gradlew assembleTempoDebug
           bash ./gradlew assembleNotquitemyDebug
 
-      - name: Sign Tempo Release APKs
+      - name: Sign All Tempo Release APKs
         id: sign_tempo_release
         uses: r0adkll/sign-android-release@v1
         with:
@@ -54,10 +54,11 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS_GITHUB }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD_GITHUB }}
+          apkPath: "**/*.apk"
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
-      - name: Sign NotQuiteMy Release APKs
+      - name: Sign All NotQuiteMy Release APKs
         id: sign_notquitemy_release
         uses: r0adkll/sign-android-release@v1
         with:
@@ -66,9 +67,38 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS_GITHUB }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD_GITHUB }}
+          apkPath: "**/*.apk"
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
+      - name: Rename and Prepare APK Files
+        run: |
+          # Copy and rename tempo APKs
+          for file in app/build/outputs/apk/tempo/release/*.apk; do
+            if [[ $file == *"arm64-v8a"* ]]; then
+              cp "$file" "./app-tempo-arm64-v8a-release.apk"
+              echo "Created: app-tempo-arm64-v8a-release.apk"
+            elif [[ $file == *"armeabi-v7a"* ]]; then
+              cp "$file" "./app-tempo-armeabi-v7a-release.apk"
+              echo "Created: app-tempo-armeabi-v7a-release.apk"
+            fi
+          done
+          
+          # Copy and rename notquitemy APKs
+          for file in app/build/outputs/apk/notquitemy/release/*.apk; do
+            if [[ $file == *"arm64-v8a"* ]]; then
+              cp "$file" "./app-notquitemy-arm64-v8a-release.apk"
+              echo "Created: app-notquitemy-arm64-v8a-release.apk"
+            elif [[ $file == *"armeabi-v7a"* ]]; then
+              cp "$file" "./app-notquitemy-armeabi-v7a-release.apk"
+              echo "Created: app-notquitemy-armeabi-v7a-release.apk"
+            fi
+          done
+          
+          # List the created files for verification
+          echo "Final APK files:"
+          ls -la *.apk
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -79,24 +109,44 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Upload Release APKs
+      - name: Upload Tempo 64-bit Release APK
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{steps.sign_tempo_release.outputs.signedReleaseFile}}
-          asset_name: app-tempo-release.apk
+          asset_path: ./app-tempo-arm64-v8a-release.apk
+          asset_name: app-tempo-arm64-v8a-release.apk
           asset_content_type: application/vnd.android.package-archive
 
-      - name: Upload NotQuiteMy Release APK
+      - name: Upload Tempo 32-bit Release APK
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{steps.sign_notquitemy_release.outputs.signedReleaseFile}}
-          asset_name: app-notquitemy-release.apk
+          asset_path: ./app-tempo-armeabi-v7a-release.apk
+          asset_name: app-tempo-armeabi-v7a-release.apk
+          asset_content_type: application/vnd.android.package-archive
+
+      - name: Upload NotQuiteMy 64-bit Release APK
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./app-notquitemy-arm64-v8a-release.apk
+          asset_name: app-notquitemy-arm64-v8a-release.apk
+          asset_content_type: application/vnd.android.package-archive
+
+      - name: Upload NotQuiteMy 32-bit Release APK
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./app-notquitemy-armeabi-v7a-release.apk
+          asset_name: app-notquitemy-armeabi-v7a-release.apk
           asset_content_type: application/vnd.android.package-archive
 
       - name: Upload Debug APKs as artifacts
@@ -113,6 +163,8 @@ jobs:
         with:
           name: release-apks
           path: |
-            ${{steps.sign_tempo_release.outputs.signedReleaseFile}}
-            ${{steps.sign_notquitemy_release.outputs.signedReleaseFile}}
+            ./app-tempo-arm64-v8a-release.apk
+            ./app-tempo-armeabi-v7a-release.apk
+            ./app-notquitemy-arm64-v8a-release.apk
+            ./app-notquitemy-armeabi-v7a-release.apk
           retention-days: 30
\ No newline at end of file