chore(deploy): bump image to bb670d6c [skip ci]

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitea/workflows/android-build.yml

@@ -12,7 +12,8 @@ on:
       - '**.md'
 
 env:
-  ANDROID_SDK_ROOT: /opt/android-sdk
+  ANDROID_HOME: /opt/android-sdk
+  ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653
   NDK_VERSION: "25.2.9519653"
   BUILD_TOOLS_VERSION: "34.0.0"
 
@@ -34,34 +35,31 @@ jobs:
         uses: actions/cache@v4
         id: sdk-cache
         with:
-          path: ${{ env.ANDROID_SDK_ROOT }}
+          path: ${{ env.ANDROID_HOME }}
-          key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
+          key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
 
       - name: Install system dependencies
-        run: sudo apt-get install -y openjdk-17-jdk-headless unzip
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y openjdk-17-jdk-headless unzip
 
       - name: Install Android SDK + NDK
         if: steps.sdk-cache.outputs.cache-hit != 'true'
         run: |
-          mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
+          mkdir -p "$ANDROID_HOME/cmdline-tools"
           curl -sL \
             "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
             -o /tmp/cmdtools.zip
           unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
-          mv /tmp/cmdtools/cmdline-tools "$ANDROID_SDK_ROOT/cmdline-tools/latest"
+          mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
           # Accept all SDK licences non-interactively.
-          yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses \
+          yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \
             > /dev/null 2>&1 || true
-          "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" \
+          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" \
             "build-tools;$BUILD_TOOLS_VERSION" \
             "platforms;android-34" \
             "ndk;$NDK_VERSION"
 
-      - name: Export Android environment
-        run: |
-          echo "ANDROID_HOME=$ANDROID_SDK_ROOT"              >> "$GITHUB_ENV"
-          echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/$NDK_VERSION" >> "$GITHUB_ENV"
-
 # ── Rust toolchain ─────────────────────────────────────────────────
       - name: Install Rust stable
         run: |
@@ -101,13 +99,32 @@ jobs:
           key: android-target-${{ hashFiles('**/Cargo.lock') }}-${{ github.sha }}
           restore-keys: android-target-${{ hashFiles('**/Cargo.lock') }}-
 
+      # ── Debug: verify SDK layout ───────────────────────────────────────
+      - name: Verify SDK layout
+        run: |
+          echo "ANDROID_HOME=$ANDROID_HOME"
+          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
+          echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME"
+          ls "$ANDROID_HOME/" 2>/dev/null || echo "ANDROID_HOME dir missing"
+          ls "$ANDROID_HOME/platforms/" 2>/dev/null || echo "platforms/ missing"
+          ls "$ANDROID_HOME/ndk/" 2>/dev/null || echo "ndk/ missing"
+
       # ── Build ──────────────────────────────────────────────────────────
       - name: Install cargo-apk
         if: steps.apk-tool-cache.outputs.cache-hit != 'true'
         run: cargo install cargo-apk --locked
 
       - name: Build debug APK
-        run: cargo apk build --package solitaire_app --lib
+        run: |
+          echo "=== env at build time ==="
+          echo "ANDROID_HOME=$ANDROID_HOME"
+          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
+          printenv | grep -i android || true
+          ls "$ANDROID_HOME/platforms/" || echo "platforms dir missing"
+          ls "$ANDROID_HOME/platforms/android-34/" | head -10 || echo "android-34 dir missing"
+          ls "$ANDROID_HOME/platforms/android-34/android.jar" && echo "android.jar OK" || echo "android.jar MISSING"
+          echo "========================="
+          cargo apk build --package solitaire_app --lib
 
       # ── Artifact ───────────────────────────────────────────────────────
       - name: Upload APK

.gitea/workflows/android-release.yml

@@ -6,7 +6,8 @@ on:
       - 'v*.*.*'
 
 env:
-  ANDROID_SDK_ROOT: /opt/android-sdk
+  ANDROID_HOME: /opt/android-sdk
+  ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653
   NDK_VERSION: "25.2.9519653"
   BUILD_TOOLS_VERSION: "34.0.0"
   GITEA_API: https://git.aleshym.co/api/v1
@@ -31,34 +32,31 @@ jobs:
         uses: actions/cache@v4
         id: sdk-cache
         with:
-          path: ${{ env.ANDROID_SDK_ROOT }}
+          path: ${{ env.ANDROID_HOME }}
-          key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
+          key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
 
       # Java and jq are always needed (apksigner requires Java even on cache hits).
       - name: Install system dependencies
-        run: sudo apt-get install -y openjdk-17-jdk-headless unzip jq
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y openjdk-17-jdk-headless unzip jq
 
       - name: Install Android SDK + NDK
         if: steps.sdk-cache.outputs.cache-hit != 'true'
         run: |
-          mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
+          mkdir -p "$ANDROID_HOME/cmdline-tools"
           curl -sL \
             "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
             -o /tmp/cmdtools.zip
           unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
-          mv /tmp/cmdtools/cmdline-tools "$ANDROID_SDK_ROOT/cmdline-tools/latest"
+          mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
-          yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses \
+          yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \
             > /dev/null 2>&1 || true
-          "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" \
+          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" \
             "build-tools;$BUILD_TOOLS_VERSION" \
             "platforms;android-34" \
             "ndk;$NDK_VERSION"
 
-      - name: Export Android environment
-        run: |
-          echo "ANDROID_HOME=$ANDROID_SDK_ROOT"                        >> "$GITHUB_ENV"
-          echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/$NDK_VERSION"  >> "$GITHUB_ENV"
-
 # ── Rust toolchain ─────────────────────────────────────────────────
       - name: Install Rust stable
         run: |

deploy/kustomization.yaml

@@ -20,4 +20,4 @@ resources:
 images:
 - name: solitaire-server
   newName: git.aleshym.co/funman300/solitaire-server
-  newTag: 0f650311
+  newTag: bb670d6c