From a1c0954a4d7ef898f5e798c2d8c4ffc581ca4d48 Mon Sep 17 00:00:00 2001
From: robot <robot@hermes.local>
Date: Mon, 3 Aug 2026 23:00:35 +0000
Subject: [PATCH] fix(ci): address Kyle's review feedback

- Pin runner labels: ubuntu-latest -> ubuntu-24.04 (lint, test, build-android)
- Fix iOS runner: ubuntu-latest -> [self-hosted, macos]
- Install JDK via apt-get instead of manual curl download
- Update JAVA_HOME to /usr/lib/jvm/java-17-openjdk-amd64
---
 .gitea/workflows/ci.yml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index d1a7055..1d7cfe3 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
   # ── Stage 1: Lint & static analysis (best-effort on any runner) ──
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     continue-on-error: true
     steps:
       - name: Checkout
@@ -71,7 +71,7 @@ jobs:
   # ── Stage 1 (parallel): Unit & widget tests (best-effort) ───────
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     continue-on-error: true
     steps:
       - name: Checkout
@@ -104,7 +104,7 @@ jobs:
   # ── Stage 3: Android build ──────────────────────────────────────
   build-android:
     name: Build Android
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [lint, test]
     steps:
       - name: Checkout
@@ -122,12 +122,10 @@ jobs:
       - name: Setup Java 17
         run: |
           set -e
-          curl -fsSL "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz" \
-            -o /tmp/jdk.tar.gz
-          mkdir -p "$HOME/jdk"
-          tar -xzf /tmp/jdk.tar.gz -C "$HOME/jdk" --strip-components=1
-          export PATH="$HOME/jdk/bin:$PATH"
-          export JAVA_HOME="$HOME/jdk"
+          apt-get update
+          apt-get install -y openjdk-17-jdk
+          export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+          export PATH="$JAVA_HOME/bin:$PATH"
           java -version
 
       - name: Setup Flutter
@@ -142,8 +140,8 @@ jobs:
       - name: Install Android SDK command-line tools
         run: |
           set -e
-          export JAVA_HOME="$HOME/jdk"
-          export PATH="$HOME/jdk/bin:$PATH"
+          export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+          export PATH="/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH"
           export ANDROID_HOME="${HOME}/android-sdk"
           mkdir -p "${ANDROID_HOME}/cmdline-tools"
           curl -fsSL "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" -o /tmp/cmdline-tools.zip
@@ -160,8 +158,8 @@ jobs:
 
       - name: Accept Android SDK licenses
         run: |
-          export JAVA_HOME="$HOME/jdk"
-          export PATH="$HOME/jdk/bin:$PATH"
+          export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+          export PATH="/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH"
           yes | "${HOME}/android-sdk/cmdline-tools/latest/bin/sdkmanager" --licenses || true
 
       - name: Install dependencies
@@ -182,14 +180,14 @@ jobs:
 
       - name: Build APK (release)
         run: |
-          export JAVA_HOME="$HOME/jdk"
+          export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
           export ANDROID_HOME="${HOME}/android-sdk"
           export PATH="$PWD/flutter/bin:$PATH"
           flutter build apk --release
 
       - name: Build App Bundle (release)
         run: |
-          export JAVA_HOME="$HOME/jdk"
+          export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
           export ANDROID_HOME="${HOME}/android-sdk"
           export PATH="$PWD/flutter/bin:$PATH"
           flutter build appbundle --release
@@ -212,7 +210,7 @@ jobs:
   # ── Stage 2 (parallel): iOS build ───────────────────────────────
   build-ios:
     name: Build iOS
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, macos]
     needs: [lint, test]
     if: always()
     steps: