From 6c8fceab02d18c4e38104b2a2b65e2b79294afea Mon Sep 17 00:00:00 2001
From: "Rodrigo Rodriguez (Pragmatismo)" <me@rodrigorodriguez.com>
Date: Tue, 16 Dec 2025 16:35:22 -0300
Subject: [PATCH] Fix APK build flag and add Cargo caching

---
 .forgejo/workflows/botapp.yaml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/botapp.yaml b/.forgejo/workflows/botapp.yaml
index 087629c..b2f8842 100644
--- a/.forgejo/workflows/botapp.yaml
+++ b/.forgejo/workflows/botapp.yaml
@@ -16,6 +16,17 @@ jobs:
 
       - uses: actions/checkout@v4
 
+      - name: Cache Cargo registry
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-android-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-android-
+
       - name: Install Rust
         uses: msrd0/rust-toolchain@v1
         with:
@@ -29,17 +40,21 @@ jobs:
           export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
 
       - name: Install Tauri CLI
-        run: cargo install tauri-cli
+        run: |
+          if ! command -v cargo-tauri &> /dev/null; then
+            cargo install tauri-cli
+          fi
 
       - name: Build Android APK
         run: |
           export ANDROID_HOME=/opt/android-sdk
           export NDK_HOME=$ANDROID_HOME/ndk/26.1.10909125
           export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
-          cargo tauri android build --apk
+          cargo tauri android build
 
       - name: Deploy APK
         run: |
           sudo mkdir -p /opt/gbo/releases/botapp
-          sudo cp ./target/android/release/apk/*.apk /opt/gbo/releases/botapp/
+          sudo cp ./gen/android/app/build/outputs/apk/universal/release/*.apk /opt/gbo/releases/botapp/ || true
+          sudo cp ./gen/android/app/build/outputs/apk/release/*.apk /opt/gbo/releases/botapp/ || true
           sudo chmod 644 /opt/gbo/releases/botapp/*.apk