Refactor release workflow to build both AAB and APK, streamline environment variables, and improve artifact handling

Author: rohittp0

.github/workflows/release.yml

@@ -8,58 +8,102 @@ on:
   push:
     branches:
       - main
-      - release/*
 
 permissions:
   contents: write
 
+env: # avoid repeating these in every job
+  KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+  KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+  LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
+  JKS_B64: ${{ secrets.KEYSTORE_BASE64 }}
+
 jobs:
-  build:
+  build-aab:
     runs-on: ubuntu-latest
-
     steps:
-      # 1. Check out the repository
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      # 2. Create local.properties with the proper sdk.dir (update the path if needed)
-      - name: Create local.properties file
-        run: echo "${{ secrets.LOCAL_PROPERTIES }}" > local.properties
+      - name: Create local.properties
+        run: echo "$LOCAL_PROPERTIES" > local.properties
 
-      # 3. Set up JDK 21
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '21'
           cache: gradle
 
-      # 4. Setup Gradle
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+      - name: Decode keystore
+        run: echo "$JKS_B64" | base64 --decode > app/keystore.jks
+
+      - name: Increment Version Numbers
+        id: increment_version
+        run: bash increment_version.sh
 
-      # 5. Decode the Base64‑encoded JKS keystore and save it as app/keystore.jks
-      - name: Decode JKS keystore
-        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > app/keystore.jks
+      - name: Build bundleRelease
+        run: ./gradlew --no-daemon --configuration-cache bundleRelease
 
-      # 6. Make the Gradle wrapper executable
-      - name: Make gradlew executable
-        run: chmod +x gradlew
+      - name: Upload AAB + symbols
+        uses: actions/upload-artifact@v4
+        with:
+          name: aab
+          path: |
+            app/release/app-release.aab
+            app/release/native-debug-symbols.zip
+
+  build-apk:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create local.properties
+        run: echo "$LOCAL_PROPERTIES" > local.properties
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+          cache: gradle
 
-      # 7. Increment version numbers by calling the shell script
       - name: Increment Version Numbers
         id: increment_version
         run: bash increment_version.sh
 
-      # 8. Build the release App Bundle using configuration caching
-      - name: Build Android App
-        env:
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        run: ./gradlew --configuration-cache bundleRelease
+      - name: Decode keystore
+        run: echo "$JKS_B64" | base64 --decode > app/keystore.jks
+
+      - name: Build assembleRelease
+        run: ./gradlew --no-daemon --configuration-cache assembleRelease
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: apk
+          path: app/build/outputs/apk/release/app-release.apk
+
+  release:
+    needs: [ build-aab, build-apk ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download AAB artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: aab
+
+      - name: Download APK artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: apk
+
+      - name: Increment Version Numbers
+        id: increment_version
+        run: bash increment_version.sh
 
-      # 9. Create a GitHub Release and upload the bundle using the new version as the tag name
       - name: Create GitHub Release and upload the bundle
         id: create_release
         uses: softprops/action-gh-release@v2
@@ -68,8 +112,9 @@ jobs:
         with:
           tag_name: ${{ steps.increment_version.outputs.new_version }}
           files: |
-            app/release/app-release.aab
-            app/release/native-debug-symbols.zip
+            **/app-release.aab
+            **/native-debug-symbols.zip
+            app-release.apk
 
       - name: Commit Version Number Increment and Push
         run: |