From e41e651b96e4c593b2288ae39e02e7811a654eb6 Mon Sep 17 00:00:00 2001
From: Mathieu <github@kumy.net>
Date: Thu, 26 Jan 2023 11:23:31 +0100
Subject: [PATCH] Adjust workflow for new build releases

---
 .github/workflows/android.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3fd8d1ce..7d1e0597 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -29,13 +29,16 @@ jobs:
         run: cd obv_messenger/ && ./gradlew assembleRelease --stacktrace
 
       - name: Rename APK
-        run: mv obv_messenger/app/build/outputs/apk/prod/release/app-prod-release-unsigned.apk Olvid.apk
+        run: |
+          find . -name '*.apk'
+          mv ./obv_messenger/app/build/outputs/apk/prodFull/release/app-prod-full-release-unsigned.apk Olvid.apk
+          mv ./obv_messenger/app/build/outputs/apk/prodNogoogle/release/app-prod-nogoogle-release-unsigned.apk Olvid-nogoogle.apk
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: apk
-          path: Olvid.apk
+          path: Olvid*.apk
 
   release:
     name: Sign/Release APK
@@ -45,7 +48,7 @@ jobs:
     steps:
 
       - name: Download APK from build
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: apk
 
@@ -72,4 +75,6 @@ jobs:
         with:
           files: |
             Olvid.apk
-            ${{steps.sign_app.outputs.signedReleaseFile}}
+            Olvid-nogoogle.apk
+            ${{steps.sign_app.outputs.signedReleaseFile0}}
+            ${{steps.sign_app.outputs.signedReleaseFile1}}