From 8e1e9a104bb9774152020a9c049b5b6485ba8786 Mon Sep 17 00:00:00 2001
From: PalmDevs <git@palmdevs.me>
Date: Wed, 15 Oct 2025 01:48:25 +0700
Subject: [PATCH] ci: fix workflows

---
 .github/workflows/build.yml   | 28 +++++++++++++++++-----------
 .github/workflows/release.yml | 20 ++++++++++----------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bfcf9b2..7a52e76 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,26 +32,32 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Optional Keystore (if provided)
-        if: ${{ secrets.keystore != '' }}
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE }}
         run: |
-          echo "${{ secrets.keystore }}" | base64 -d > signing-key.jks
-          ls -l signing-key.jks
+          if [ -n "$KEYSTORE" ]; then
+            echo "$KEYSTORE" | base64 -d > signing-key.jks
+            ls -l signing-key.jks
+          else
+            echo "No keystore provided, skipping..."
+          fi
 
       - name: Assemble Debug and Release
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          GRADLE_OPTS: -Dorg.gradle.daemon=false
         run: |
           if [ -f signing-key.jks ]; then
-            ./gradlew \
-              assembleDebug \
-              assembleRelease \
+            ./gradlew assembleDebug assembleRelease \
               -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/signing-key.jks \
-              -Pandroid.injected.signing.store.password='${{ secrets.keystore_password }}' \
-              -Pandroid.injected.signing.key.alias='${{ secrets.key_alias }}' \
-              -Pandroid.injected.signing.key.password='${{ secrets.key_password }}'
+              -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \
+              -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \
+              -Pandroid.injected.signing.key.password="$KEY_PASSWORD"
           else
             ./gradlew assembleDebug assembleRelease
           fi
-        env:
-          GRADLE_OPTS: -Dorg.gradle.daemon=false
 
       - name: Collect APKs
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 82f2b35..9477ef3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,21 +58,21 @@ jobs:
 
       - name: Prepare Keystore
         run: |
-          echo "${{ secrets.keystore }}" | base64 -d > signing-key.jks
+          echo "${{ secrets.KEYSTORE }}" | base64 -d > signing-key.jks
           ls -l signing-key.jks
 
       - name: Build Universal APKs
-        run: |
-          chmod +x ./gradlew
-          ./gradlew \
-            packageDebugUniversalApk \
-            packageReleaseUniversalApk \
-            -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/signing-key.jks \
-            -Pandroid.injected.signing.store.password='${{ secrets.keystore_password }}' \
-            -Pandroid.injected.signing.key.alias='${{ secrets.key_alias }}' \
-            -Pandroid.injected.signing.key.password='${{ secrets.key_password }}'
         env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           GRADLE_OPTS: -Dorg.gradle.daemon=false
+        run: |
+          ./gradlew packageDebugUniversalApk packageReleaseUniversalApk \
+            -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/signing-key.jks \
+            -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \
+            -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \
+            -Pandroid.injected.signing.key.password="$KEY_PASSWORD"
 
       - name: Collect APKs
         run: |