From 6301be3be05ab04133840f7d296f49276ddd354f Mon Sep 17 00:00:00 2001
From: Bytemalte <malxte@gmx.de>
Date: Fri, 23 Jan 2026 17:27:15 +0100
Subject: [PATCH]  Xiaomi Runner Config

---
 .gitea/workflows/android.yaml | 45 ++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/.gitea/workflows/android.yaml b/.gitea/workflows/android.yaml
index f886bd9..209bd72 100644
--- a/.gitea/workflows/android.yaml
+++ b/.gitea/workflows/android.yaml
@@ -8,26 +8,34 @@ jobs:
       image: node:20-bookworm
 
     steps:
-      - name: Checkout Code
+      - name: Checkout Main Project
         uses: actions/checkout@v4
+        with:
+          submodules: false # WICHTIG: Verhindert den Absturz beim Checkout
+          path: "."
+
+      - name: Manual Clone easy-nostr
+        run: |
+          # Wir klonen dein Crate manuell in den Ordner, den Rust erwartet
+          # Wir nutzen den Pfad aus deinem 'ls src-tauri'
+          git clone https://gitea.malxte.de/Bytemalte/easy-nostr.git Bytemalte/marstemedia/src-tauri/easy-nostr
 
       - name: Install System Dependencies
         run: |
           apt-get update
           apt-get install -y build-essential curl wget file libssl-dev pkg-config openjdk-17-jdk git unzip libgtk-3-dev webkit2gtk-4.1 libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev python3
 
-      - name: Install Rust
+      - name: Install Rust & Targets
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
           export PATH="$HOME/.cargo/bin:$PATH"
           rustup target add aarch64-linux-android
 
-      - name: Install Trunk & Tauri-CLI (Instant Download)
+      - name: Install Trunk & Tauri-CLI (Instant Binary)
         run: |
-          # Trunk Binärdatei direkt laden (spart 15 Min Kompilieren)
+          # Keine 20 Min warten: Wir laden die fertigen Programme
           wget -qO- https://github.com/trunk-rs/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C /usr/local/bin
-          # Tauri-CLI Binärdatei direkt laden
           wget -qO- https://github.com/tauri-apps/tauri/releases/latest/download/cargo-tauri-x86_64-unknown-linux-gnu.tgz | tar -xzf- -C /usr/local/bin
           chmod +x /usr/local/bin/trunk /usr/local/bin/cargo-tauri
 
@@ -45,40 +53,27 @@ jobs:
           echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
           echo "NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393" >> $GITHUB_ENV
 
-      - name: Rust Cache
-        uses: https://github.com/actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Build App
+      - name: Build and Compile
         run: |
           export PATH="$HOME/.cargo/bin:$PATH"
           export NDK_HOME=$HOME/android-sdk/ndk/25.1.8937393
 
-          # In den Projektordner wechseln (Basierend auf deinem Log)
-          cd Bytemalte/marstemedia || echo "Root"
+          # In dein Projektverzeichnis wechseln
+          cd Bytemalte/marstemedia
 
-          # Frontend bauen
+          # 1. Frontend mit Trunk bauen (erzeugt den dist-Ordner)
           trunk build --release
 
-          # Android initialisieren falls nötig
+          # 2. Android APK bauen (mit der tauri-binary)
           if [ ! -d "src-tauri/gen/android" ]; then
             cargo-tauri android init
           fi
-
-          # Finaler Build
           cargo-tauri android build --target aarch64
         env:
           JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
 
-      - name: Upload APK
+      - name: Upload APK Artifact
         uses: actions/upload-artifact@v4
         with:
           name: Xiaomi-App
-          path: "**/build/outputs/apk/release/*.apk"
+          path: "Bytemalte/marstemedia/src-tauri/gen/android/app/build/outputs/apk/release/*.apk"