From 82654b275dee1dff0419017eb51971915ab463e0 Mon Sep 17 00:00:00 2001
From: Victor Andreasson <victor.andreasson@fripost.org>
Date: Thu, 24 Oct 2024 22:21:25 +0200
Subject: [PATCH] test

---
 .github/workflows/build-test-apk.yml | 40 +++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-test-apk.yml b/.github/workflows/build-test-apk.yml
index fa5922fe..ec445b09 100644
--- a/.github/workflows/build-test-apk.yml
+++ b/.github/workflows/build-test-apk.yml
@@ -40,11 +40,25 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Store unsigned F-Droid release APK
+      - name: Sign F-Droid APK
+        uses: r0adkll/sign-android-release@v1
+        id: sign_fdroid_apk
+        with:
+          releaseDirectory: app/build/outputs/apk/fdroid/release
+          signingKeyBase64: ${{ secrets.APK_SIGNING_KEYSTORE_FILE }}
+          alias: key0
+          keyStorePassword: ${{ secrets.APK_SIGNING_KEYSTORE_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
+
+      - name: Rename F-Droid APK file
+        run: mv ${{steps.sign_fdroid_apk.outputs.signedReleaseFile}} orgzly-revived-fdroid-${{ env.COMMIT_SHA }}.apk
+
+      - name: Store F-Droid release APK
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.COMMIT_SHA }}-fdroid-unsigned-release.apk
-          path: app/build/outputs/apk/fdroid/release/*.apk
+          name: orgzly-revived-fdroid-${{ env.COMMIT_SHA }}.apk
+          path: orgzly-revived-fdroid-${{ env.COMMIT_SHA }}.apk
 
       # "Premium" APK
 
@@ -59,8 +73,22 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Store unsigned Premium release APK
+      - name: Sign "premium" APK
+        uses: r0adkll/sign-android-release@v1
+        id: sign_premium_apk
+        with:
+          releaseDirectory: app/build/outputs/apk/premium/release
+          signingKeyBase64: ${{ secrets.APK_SIGNING_KEYSTORE_FILE }}
+          alias: key0
+          keyStorePassword: ${{ secrets.APK_SIGNING_KEYSTORE_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
+
+      - name: Rename "premium" APK file
+        run: mv ${{steps.sign_premium_apk.outputs.signedReleaseFile}} orgzly-revived-premium-${{ env.COMMIT_SHA }}.apk
+
+      - name: Store "premium" release APK
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.COMMIT_SHA }}-premium-unsigned-release.apk
-          path: app/build/outputs/apk/premium/release/*.apk
+          name: orgzly-revived-premium-${{ env.COMMIT_SHA }}.apk
+          path: orgzly-revived-premium-${{ env.COMMIT_SHA }}.apk