From 7d949fc16c1655ceb978d69219e3249919ed95af Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Fri, 3 May 2024 19:36:38 +0200
Subject: [PATCH] fix(ci-cd): Improve CI:CD

Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com>
---
 .github/actions/prepare-keystore/action.yml | 9 +++------
 .github/workflows/release-app-github.yaml   | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/actions/prepare-keystore/action.yml b/.github/actions/prepare-keystore/action.yml
index b6290f0..2cb0830 100644
--- a/.github/actions/prepare-keystore/action.yml
+++ b/.github/actions/prepare-keystore/action.yml
@@ -19,15 +19,12 @@ runs:
   using: composite
   steps:
     - name: Write Keystore file 🗄️
-      id: android_keystore
-      uses: timheuer/base64-to-file@v1.0.3
-      with:
-        fileName: key.jks
-        encodedString: ${{ inputs.keyStoreBase64 }}
+      shell: bash
+      run: echo "${{ inputs.keyStoreBase64 }}" | base64 -d > /home/runner/key.jks
 
     - name: Write Keystore properties 🗝️
       run: |
-        echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > key.properties
+        echo "storeFile=/home/runner/key.jks" > key.properties
         echo "storePassword=${{ inputs.signingStorePassword }}" >> key.properties
         echo "keyPassword=${{ inputs.signingKeyPassword }}" >> key.properties
         echo "keyAlias=${{ inputs.signingKeyAlias }}" >> key.properties
diff --git a/.github/workflows/release-app-github.yaml b/.github/workflows/release-app-github.yaml
index 14b9c92..c5479f1 100644
--- a/.github/workflows/release-app-github.yaml
+++ b/.github/workflows/release-app-github.yaml
@@ -32,9 +32,6 @@ jobs:
       - name: Build APKs 📱
         run: ./gradlew assembleRelease
 
-      - name: Build AABs 📱
-        run: ./gradlew bundleRelease
-
       - name: Upload APKs 🚀
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
@@ -43,6 +40,9 @@ jobs:
         with:
           files: app/build/outputs/apk/release/*.apk
 
+      - name: Build AABs 📱
+        run: ./gradlew bundleRelease
+
       - name: Upload APKs bundles 🚀
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')