.devcontainer/devcontainer.json

@@ -1,8 +1,5 @@
 {
   "name": "kryz-go",
-  "mounts": [
-    // "source=/dev/dri,target=/dev/dri,type=bind"
-  ],
   "build": {
     "dockerfile": "Dockerfile"
   },
@@ -14,8 +11,7 @@
       ]
     }
   },
-  "postCreateCommand": "flutter pub get && python3 -m venv .venv && . .venv/bin/activate && pip install --upgrade pip && pip install -r requirements.txt && curl -fsSL https://claude.ai/install.sh | bash",
+  "postCreateCommand": "flutter pub get",
-  "postStartCommand": ".venv/bin/activate",
   "containerEnv": {
     "ANTHROPIC_BASE_URL": "http://192.168.1.108:1234",
     "ANTHROPIC_API_KEY": "lmstudio",

.gitea/workflows/ci.yml

@@ -7,12 +7,9 @@
 # Lint/test use continue-on-error: true so Magrathea failures don't block.
 # Android build detects wrong platform and exits 0 gracefully.
 #
-# CONTAINER IMAGE: The build-android job uses a pre-built Docker image
+# IMPORTANT: $GITHUB_PATH does NOT persist between steps in Gitea Actions/act.
-# (kryz-ci:latest) that includes Flutter, JDK 17, and Android SDK baked in —
+# Each step is a separate shell. We export PATH="$PWD/flutter/bin:$PATH" in
-# eliminating 3-5 GB of downloads per job. Build once on the runner host:
+# every step that uses flutter/dart commands.
-#   docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
-#
-# Estimated impact: 40min -> 5-10min (with pre-built image)
 
 name: CI
 
@@ -118,6 +115,10 @@ jobs:
 
 
   # ── Stage 2: Android build (uses pre-built container image) ──────
+  # The kryz-ci:latest image contains Flutter, JDK 17, Android SDK, and
+  # flutter precache --android baked in — eliminating ~3-5 GB of downloads.
+  # Build once on the runner host:
+  #   docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
   build-android:
     name: Build Android
     runs-on: [self-hosted, linux, x64]

.gitea/workflows/release.yml

@@ -1,6 +1,11 @@
 # kryz-go-flutter Release Pipeline
 # Triggers on version tags (v1.0.0, v1.0.1, etc.)
 # Produces signed artifacts and attaches them to a Gitea Release
+#
+# CONTAINER IMAGE: The build-android job uses a pre-built Docker image
+# (kryz-ci:latest) that includes Flutter, JDK 17, and Android SDK baked in.
+# Build once on the runner host:
+#   docker build -f .devcontainer/ci.Dockerfile -t kryz-ci:latest .devcontainer
 
 name: Release
 
@@ -24,6 +29,11 @@ jobs:
       - 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"
@@ -64,6 +74,11 @@ jobs:
       - 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"
@@ -86,60 +101,26 @@ jobs:
           flutter test --reporter=expanded
 
 
-  # ── Android release build ───────────────────────────────────
+  # ── Android release build (uses pre-built container image) ──────
   build-android:
     name: Build Android Release
     runs-on: [self-hosted, linux, x64]
     needs: [test]
+    container:
+      image: kryz-ci:latest
+      options: --user vscode
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Java 17
+      - name: Verify environment
         run: |
-          set -e
+          echo "=== Environment check ==="
-          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" \
+          echo "Flutter: $(flutter --version | head -1)"
-            -o /tmp/jdk.tar.gz
+          echo "Java: $(java -version 2>&1 | head -1)"
-          mkdir -p "$HOME/jdk"
+          echo "SDK tools: $(sdkmanager --version)"
-          tar -xzf /tmp/jdk.tar.gz -C "$HOME/jdk" --strip-components=1
+          echo "Android SDK: $ANDROID_HOME"
-          export PATH="$HOME/jdk/bin:$PATH"
+          echo "JAVA_HOME: $JAVA_HOME"
-          export JAVA_HOME="$HOME/jdk"
-          java -version
-
-      - name: Setup Flutter
-        run: |
-          set -e
-          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 Android SDK command-line tools
-        run: |
-          set -e
-          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
-          unzip -q /tmp/cmdline-tools.zip -d "${ANDROID_HOME}/cmdline-tools"
-          mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest"
-          export PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${PATH}"
-          yes | sdkmanager --licenses >/dev/null 2>&1 || true
-          sdkmanager "platform-tools" "platforms;android-35" "build-tools;35.0.0"
-
-      - name: Pre-cache Android platform artifacts
-        run: |
-          export PATH="$PWD/flutter/bin:$PATH"
-          flutter precache --android
-
-      - name: Accept Android SDK licenses
-        run: |
-          yes | "${HOME}/android-sdk/cmdline-tools/latest/bin/sdkmanager" --licenses || true
-
-      - name: Setup Python
-        run: |
-          set -e
-          python3 --version
 
       - name: Install Python dependencies
         run: |
@@ -147,14 +128,10 @@ jobs:
           pip install -r requirements.txt || true
 
       - name: Install Flutter dependencies
-        run: |
+        run: flutter pub get
-          export PATH="$PWD/flutter/bin:$PATH"
-          flutter pub get
 
       - name: Generate stubs (lint gate support)
-        run: |
+        run: python3 ci_stub_gen.py
-          export PATH="$PWD/flutter/bin:$PATH"
-          python3 ci_stub_gen.py
 
       # If release signing secrets are available, write keystore
       # and update build.gradle.kts to use a release signing config.
@@ -176,16 +153,10 @@ jobs:
           EOF
 
       - name: Build APK (release)
-        run: |
+        run: flutter build apk --release
-          export JAVA_HOME="$HOME/jdk"
-          export PATH="$PWD/flutter/bin:$PATH"
-          flutter build apk --release
 
       - name: Build App Bundle (release)
-        run: |
+        run: flutter build appbundle --release
-          export JAVA_HOME="$HOME/jdk"
-          export PATH="$PWD/flutter/bin:$PATH"
-          flutter build appbundle --release
 
       - name: List build outputs
         run: |