From 62d27bf8b494d51e240d2152f2388800341b3322 Mon Sep 17 00:00:00 2001
From: eddy <eddy@macmini.local>
Date: Mon, 3 Aug 2026 16:53:00 +0200
Subject: [PATCH] Simplify CI to firmware build + version check only

---
 .forgejo/workflows/ci.yml | 42 +++++----------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index 7296e16..2133700 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -6,8 +6,12 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  firmware:
+  build:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
@@ -15,41 +19,5 @@ jobs:
       - name: Build firmware
         run: pio run
 
-      - name: Copy firmware to Android assets
-        run: bash tools/copy_firmware.sh
-
-      - name: Stage firmware for android job
-        run: |
-          rm -rf /tmp/ci-artifacts/firmware
-          mkdir -p /tmp/ci-artifacts/firmware
-          cp .pio/build/s3lite-server/firmware.bin /tmp/ci-artifacts/firmware/
-          cp .pio/build/s3lite-server/bootloader.bin /tmp/ci-artifacts/firmware/
-          cp .pio/build/s3lite-server/partitions.bin /tmp/ci-artifacts/firmware/
-          cp android/app/src/main/assets/firmware/boot_app0.bin /tmp/ci-artifacts/firmware/
-
-  android:
-    needs: firmware
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Restore firmware from firmware job
-        run: |
-          cp /tmp/ci-artifacts/firmware/boot_app0.bin android/app/src/main/assets/firmware/
-          cp /tmp/ci-artifacts/firmware/firmware.bin android/app/src/main/assets/firmware/
-          cp /tmp/ci-artifacts/firmware/bootloader.bin android/app/src/main/assets/firmware/
-          cp /tmp/ci-artifacts/firmware/partitions.bin android/app/src/main/assets/firmware/
-
-      - name: Build debug APK
-        working-directory: android
-        run: ./gradlew assembleDebug
-        env:
-          ANDROID_HOME: ${{ vars.ANDROID_HOME || '/home/linuxbrew/.linuxbrew/share/android-commandlinetools' }}
-
       - name: Verify version consistency
         run: bash tools/check_versions.sh
-
-      - name: Stage APK
-        run: |
-          mkdir -p /tmp/ci-artifacts
-          cp android/app/build/outputs/apk/debug/app-debug.apk /tmp/ci-artifacts/