From a76b60991e6f3c36133c48cf8ce640cbffff4575 Mon Sep 17 00:00:00 2001
From: Toaster <toaster+git@proot.uk>
Date: Tue, 8 Sep 2026 00:58:12 +0000
Subject: [PATCH] Update .gitea/workflows/build-android.yaml

---
 .gitea/workflows/build-android.yaml | 43 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/build-android.yaml b/.gitea/workflows/build-android.yaml
index b361a8eb59..df4bf4b476 100644
--- a/.gitea/workflows/build-android.yaml
+++ b/.gitea/workflows/build-android.yaml
@@ -34,33 +34,44 @@ jobs:
       - name: Install Project Dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Debug - List Repo Structure
-        run: |
-          echo "Root contents:"
-          ls -la
-          echo "Looking for android folders:"
-          find . -maxdepth 3 -type d -iname "android"
+      - name: Install EAS CLI
+        run: pnpm add -g eas-cli
 
       - name: Inject Private Firebase Configuration
         run: |
-          echo "${{ secrets.FIREBASE_JSON_BASE64 }}" | base64 -d > android/app/google-services.json
+          echo "${{ secrets.FIREBASE_JSON_BASE64 }}" | base64 -d > google-services.json
 
       - name: Inject Release Keystore Certificate
         run: |
-          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > android/app/release.keystore
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore
 
-      - name: Execute Android Build
+      - name: Generate Local Credentials File
         env:
-          RELEASE_STORE_FILE: release.keystore
-          RELEASE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          RELEASE_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          RELEASE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
         run: |
-          cd android
-          ./gradlew assembleRelease
+          cat <<EOF > credentials.json
+          {
+            "android": {
+              "keystore": {
+                "keystorePath": "release.keystore",
+                "keystorePassword": "$KEYSTORE_PASSWORD",
+                "keyAlias": "$KEY_ALIAS",
+                "keyPassword": "$KEY_PASSWORD"
+              }
+            }
+          }
+          EOF
+
+      - name: Run EAS Local Build
+        env:
+          EAS_NO_VCS: 1
+        run: |
+          eas build --platform android --profile selfhosted-android --local --non-interactive --output ./bluesky-custom.apk
 
       - name: Upload Signed Application Artifact
         uses: actions/upload-artifact@v4
         with:
           name: Bluesky-Custom-Release
-          path: android/app/build/outputs/apk/release/app-release.apk
\ No newline at end of file
+          path: bluesky-custom.apk
\ No newline at end of file