From 4a6a619b419f3ef370d9faccf51aa8901e72c36a Mon Sep 17 00:00:00 2001
From: robot <robot@gitea.local>
Date: Mon, 3 Aug 2026 14:52:50 +0000
Subject: [PATCH] =?UTF-8?q?revert(ci):=20restore=20inline=20SDK=20setup=20?=
 =?UTF-8?q?=E2=80=94=20docker=20run=20approach=20causes=20runner=20stalls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 'docker run --rm' strategy (commit 065df61) requires Docker to be
available on the self-hosted runners. Jobs never leave 'queued'/'waiting'
because the runner cannot execute Docker commands.

Revert to the proven inline SDK setup from ffd37f3:
- Flutter SDK: download tarball with skip-if-already-installed
- Java 17: apt install with skip-if-already-installed
- Android SDK: cmdline-tools download with skip-if-already-installed
- Every step exports PATH=$PWD/flutter/bin:$PATH (act does not persist env)

This approach was verified working on run #42 (commit 38279ed) - all
4 stages passed: lint, test, build-android, build-ios.
---
 .gitea/workflows/ci.yml      | 187 ++++++++++++++++++++++-------------
 .gitea/workflows/release.yml | 183 +++++++++++++++++++++++-----------
 2 files changed, 245 insertions(+), 125 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index b6d286f..d727044 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -5,13 +5,9 @@
 # NOTE: Both runners share identical labels [self-hosted, linux, x64].
 # Lint/test use continue-on-error so failures on one runner don't block.
 #
-# CONTAINER STRATEGY: Each job checks for a local `kryz-ci:latest` Docker image.
-# If missing, it builds once (~25 min). Subsequent jobs find the cached image
-# and skip the build entirely. This reduces total pipeline time from ~40 min
-# (inline downloads per job) to ~25 min first run / ~5 min cached.
-#
-# To pre-build the image on your runner:
-#   docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
+# IMPORTANT: $GITHUB_PATH does NOT persist between steps in Gitea Actions/act.
+# Each step is a separate shell. We export PATH="$PWD/flutter/bin:$PATH" in
+# every step that uses flutter/dart commands.
 
 name: CI
 
@@ -42,32 +38,39 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure CI container image
+      - name: Setup Flutter
         run: |
           set -e
-          if docker image inspect kryz-ci:latest &>/dev/null; then
-            echo "CI image kryz-ci:latest already cached — skipping build."
-          else
-            echo "Building CI image (first run, ~25 min)..."
-            docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-            echo "CI image built successfully."
+          if command -v flutter &> /dev/null; then
+            echo "Flutter already installed, skipping download."
+            flutter --version
+            exit 0
           fi
+          curl -fsSL "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_VERSION }}-stable.tar.xz" -o /tmp/flutter.tar.xz
+          tar -xf /tmp/flutter.tar.xz -C "$PWD"
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter --version
+
+      - name: Install dependencies
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter pub get
+
+      - name: Generate stubs (lint gate support)
+        if: hashFiles('theme.json') == ''
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 ci_stub_gen.py
 
       - name: Analyze Dart code
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            bash -c 'flutter pub get && flutter analyze lib/ test/'
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter analyze lib/ test/
 
       - name: Auto-format source
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            dart format lib/ test/
+          export PATH="$PWD/flutter/bin:$PATH"
+          dart format lib/ test/
 
 
   # ── Stage 1 (parallel): Unit & widget tests ──
@@ -79,27 +82,38 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure CI container image
+      - name: Setup Flutter
         run: |
           set -e
-          if docker image inspect kryz-ci:latest &>/dev/null; then
-            echo "CI image kryz-ci:latest already cached — skipping build."
-          else
-            echo "Building CI image (first run, ~25 min)..."
-            docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-            echo "CI image built successfully."
+          if command -v flutter &> /dev/null; then
+            echo "Flutter already installed, skipping download."
+            flutter --version
+            exit 0
           fi
+          curl -fsSL "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_VERSION }}-stable.tar.xz" -o /tmp/flutter.tar.xz
+          tar -xf /tmp/flutter.tar.xz -C "$PWD"
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter --version
+
+      - name: Install dependencies
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter pub get
+
+      - name: Generate stubs (lint gate support)
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 ci_stub_gen.py
 
       - name: Run tests
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            bash -c 'python3 ci_stub_gen.py && flutter pub get && flutter test --reporter=expanded'
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter test --reporter=expanded
 
 
-  # ── Stage 2: Android build ──
+  # ── Stage 2: Android build (inline setup - no container dependency) ──
+  # Removed container: kryz-ci:latest because the image may not exist on
+  # the runner host, causing the job to stall indefinitely on docker pull.
   build-android:
     name: Build Android
     runs-on: [self-hosted, linux, x64]
@@ -109,49 +123,90 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure CI container image
+      - name: Check platform for Android build
         run: |
-          set -e
-          if docker image inspect kryz-ci:latest &>/dev/null; then
-            echo "CI image kryz-ci:latest already cached — skipping build."
-          else
-            echo "Building CI image (first run, ~25 min)..."
-            docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-            echo "CI image built successfully."
+          OS=$(uname -s)
+          echo "Detected OS: $OS"
+          if [ "$OS" != "Linux" ]; then
+            echo "SKIPPED: Android build requires Linux. Detected $OS."
+            exit 0
           fi
 
-      - name: Generate stubs + install deps
+      - name: Setup Java
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            bash -c 'python3 ci_stub_gen.py && flutter pub get'
+          set -e
+          if command -v java &> /dev/null; then
+            echo "Java already available: $(java -version 2>&1 | head -1)"
+            export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
+            echo "JAVA_HOME=$JAVA_HOME"
+            exit 0
+          fi
+          apt-get update && apt-get install -y openjdk-17-jre-headless
+          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+          echo "JAVA_HOME=$JAVA_HOME"
+
+      - name: Setup Flutter
+        run: |
+          set -e
+          if command -v flutter &> /dev/null; then
+            echo "Flutter already installed, skipping download."
+            flutter --version
+            exit 0
+          fi
+          curl -fsSL "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_VERSION }}-stable.tar.xz" -o /tmp/flutter.tar.xz
+          tar -xf /tmp/flutter.tar.xz -C "$PWD"
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter --version
+
+      - name: Setup Android SDK
+        run: |
+          set -e
+          if [ -d "$ANDROID_HOME/cmdline-tools" ]; then
+            echo "Android SDK already present at $ANDROID_HOME"
+            exit 0
+          fi
+          # Install Android SDK from scratch
+          export ANDROID_HOME=$PWD/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
+          unzip -q /tmp/cmdline-tools.zip -d $ANDROID_HOME/cmdline-tools
+          mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/latest
+          rm /tmp/cmdline-tools.zip
+          export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$PATH"
+          yes | sdkmanager --licenses
+          sdkmanager "platform-tools" "platforms;android-35" "build-tools;35.0.0"
+          echo "Android SDK setup complete"
+
+      - name: Flutter precache Android
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter precache --android
+
+      - name: Install dependencies
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter pub get
+
+      - name: Generate stubs (lint gate support)
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 ci_stub_gen.py
 
       - name: Run whitelabel build script
         if: hashFiles('theme.json') != ''
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            python3 build_whitelabel.py
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 build_whitelabel.py
 
       - name: Build APK (release)
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            flutter build apk --release
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter build apk --release
 
       - name: Build App Bundle (release)
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            flutter build appbundle --release
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter build appbundle --release
 
       - name: List build outputs
         run: |
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 551da1a..fc4e31b 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -21,32 +21,40 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure CI container image
+      - name: Setup Flutter
         run: |
           set -e
-          if docker image inspect kryz-ci:latest &>/dev/null; then
-            echo "CI image kryz-ci:latest already cached — skipping build."
-          else
-            echo "Building CI image (first run, ~25 min)..."
-            docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-            echo "CI image built successfully."
+          if command -v flutter &> /dev/null; then
+            echo "Flutter already installed, skipping download."
+            flutter --version
+            exit 0
           fi
+          curl -fsSL "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_VERSION }}-stable.tar.xz" \
+            -o /tmp/flutter.tar.xz
+          tar -xf /tmp/flutter.tar.xz -C "$PWD"
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter --version
+
+      - name: Install dependencies
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter pub get
+
+      - name: Generate stubs (lint gate support)
+        if: hashFiles('theme.json') == ''
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 ci_stub_gen.py
 
       - name: Analyze Dart code
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            bash -c 'flutter pub get && flutter analyze lib/ test/'
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter analyze lib/ test/
 
       - name: Check formatting
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            dart format --set-exit-if-changed lib/ test/
+          export PATH="$PWD/flutter/bin:$PATH"
+          dart format --set-exit-if-changed lib/ test/
 
 
   # ── Test (gate) ──────────────────────────────────────────────────
@@ -58,27 +66,39 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure CI container image
+      - name: Setup Flutter
         run: |
           set -e
-          if docker image inspect kryz-ci:latest &>/dev/null; then
-            echo "CI image kryz-ci:latest already cached — skipping build."
-          else
-            echo "Building CI image (first run, ~25 min)..."
-            docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-            echo "CI image built successfully."
+          if command -v flutter &> /dev/null; then
+            echo "Flutter already installed, skipping download."
+            flutter --version
+            exit 0
           fi
+          curl -fsSL "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_VERSION }}-stable.tar.xz" \
+            -o /tmp/flutter.tar.xz
+          tar -xf /tmp/flutter.tar.xz -C "$PWD"
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter --version
+
+      - name: Install dependencies
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter pub get
+
+      - name: Generate stubs (lint gate support)
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 ci_stub_gen.py
 
       - name: Run tests
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            bash -c 'python3 ci_stub_gen.py && flutter pub get && flutter test --reporter=expanded'
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter test --reporter=expanded
 
 
-  # ── Android release build ────────────────────────────────────
+  # ── Android release build (inline setup - no container dependency) ──
+  # Removed container: kryz-ci:latest because the image may not exist on
+  # the runner host, causing the job to stall indefinitely on docker pull.
   build-android:
     name: Build Android Release
     runs-on: [self-hosted, linux, x64]
@@ -87,33 +107,84 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure CI container image
+      - name: Check platform for Android build
         run: |
-          set -e
-          if docker image inspect kryz-ci:latest &>/dev/null; then
-            echo "CI image kryz-ci:latest already cached — skipping build."
-          else
-            echo "Building CI image (first run, ~25 min)..."
-            docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-            echo "CI image built successfully."
+          OS=$(uname -s)
+          echo "Detected OS: $OS"
+          if [ "$OS" != "Linux" ]; then
+            echo "SKIPPED: Android build requires Linux. Detected $OS."
+            exit 0
           fi
 
-      - name: Generate stubs + install deps
+      - name: Setup Java
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            bash -c 'python3 ci_stub_gen.py && flutter pub get'
+          set -e
+          if command -v java &> /dev/null; then
+            echo "Java already available: $(java -version 2>&1 | head -1)"
+            export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
+            echo "JAVA_HOME=$JAVA_HOME"
+            exit 0
+          fi
+          apt-get update && apt-get install -y openjdk-17-jre-headless
+          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+          echo "JAVA_HOME=$JAVA_HOME"
+
+      - name: Setup Flutter
+        run: |
+          set -e
+          if command -v flutter &> /dev/null; then
+            echo "Flutter already installed, skipping download."
+            flutter --version
+            exit 0
+          fi
+          curl -fsSL "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_VERSION }}-stable.tar.xz" -o /tmp/flutter.tar.xz
+          tar -xf /tmp/flutter.tar.xz -C "$PWD"
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter --version
+
+      - name: Setup Android SDK
+        run: |
+          set -e
+          if [ -d "$ANDROID_HOME/cmdline-tools" ]; then
+            echo "Android SDK already present at $ANDROID_HOME"
+            exit 0
+          fi
+          export ANDROID_HOME=$PWD/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
+          unzip -q /tmp/cmdline-tools.zip -d $ANDROID_HOME/cmdline-tools
+          mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/latest
+          rm /tmp/cmdline-tools.zip
+          export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$PATH"
+          yes | sdkmanager --licenses
+          sdkmanager "platform-tools" "platforms;android-35" "build-tools;35.0.0"
+          echo "Android SDK setup complete"
+
+      - name: Flutter precache Android
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter precache --android
+
+      - name: Install Python dependencies
+        run: |
+          python3 -m pip install --upgrade pip || true
+          pip install -r requirements.txt || true
+
+      - name: Install Flutter dependencies
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter pub get
+
+      - name: Generate stubs (lint gate support)
+        run: |
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 ci_stub_gen.py
 
       - name: Run whitelabel build script
         if: hashFiles('theme.json') != ''
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            python3 build_whitelabel.py
+          export PATH="$PWD/flutter/bin:$PATH"
+          python3 build_whitelabel.py
 
       - name: Configure release signing
         if: env.ANDROID_KEYSTORE_BASE64 != ''
@@ -133,19 +204,13 @@ jobs:
 
       - name: Build APK (release)
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            flutter build apk --release
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter build apk --release
 
       - name: Build App Bundle (release)
         run: |
-          docker run --rm \
-            -v "${PWD}:/workspace" \
-            -w /workspace \
-            kryz-ci:latest \
-            flutter build appbundle --release
+          export PATH="$PWD/flutter/bin:$PATH"
+          flutter build appbundle --release
 
       - name: List build outputs
         run: |