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

fix(ci): drop ANDROID_SDK_ROOT, pass --sdk_root to sdkmanager explicitly
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-14 17:51:40 +00:00 · 2026-05-14 10:47:52 -07:00 · 2026-05-14 17:45:46 +00:00 · 2026-05-14 10:41:57 -07:00 · 2026-05-14 10:37:37 -07:00 · 2026-05-14 17:32:04 +00:00
3 changed files with 45 additions and 30 deletions
@@ -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,35 +35,32 @@ jobs:
        uses: actions/cache@v4
        id: sdk-cache
        with:
-          path: ${{ env.ANDROID_SDK_ROOT }}
-          key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
+          path: ${{ env.ANDROID_HOME }}
+          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 ─────────────────────────────────────────────────
+# ── Rust toolchain ─────────────────────────────────────────────────
      - name: Install Rust stable
        run: |
          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
@@ -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
@@ -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,35 +32,32 @@ jobs:
        uses: actions/cache@v4
        id: sdk-cache
        with:
-          path: ${{ env.ANDROID_SDK_ROOT }}
-          key: android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
+          path: ${{ env.ANDROID_HOME }}
+          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"
-          yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses \
+          mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
+          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 ─────────────────────────────────────────────────
+# ── Rust toolchain ─────────────────────────────────────────────────
      - name: Install Rust stable
        run: |
          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
@@ -20,4 +20,4 @@ resources:
 images:
 - name: solitaire-server
  newName: git.aleshym.co/funman300/solitaire-server
-  newTag: 0f650311
+  newTag: bb670d6c
Author	SHA1	Message	Date
Gitea CI	2ef25934ac	chore(deploy): bump image to `bb670d6c` [skip ci]	2026-05-14 17:51:40 +00:00
funman300	bb670d6cc6	fix(ci): drop ANDROID_SDK_ROOT, pass --sdk_root to sdkmanager explicitly Android Build / build-apk (push) Failing after 3m19s Details Build and Deploy / build-and-push (push) Successful in 30s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:47:52 -07:00
Gitea CI	76911c57c9	chore(deploy): bump image to `8391235a` [skip ci]	2026-05-14 17:45:46 +00:00
funman300	8391235a1a	fix(ci): check android.jar existence in platform dir Android Build / build-apk (push) Failing after 3m25s Details Build and Deploy / build-and-push (push) Successful in 30s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:41:57 -07:00
funman300	2f3a6b9586	fix(ci): dump env at build time to diagnose ANDROID_HOME visibility Android Build / build-apk (push) Failing after 3m23s Details Build and Deploy / build-and-push (push) Failing after 40s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:37:37 -07:00
Gitea CI	4d20b70809	chore(deploy): bump image to `bfadcf0e` [skip ci]	2026-05-14 17:32:04 +00:00
funman300	bfadcf0e0d	fix(ci): add SDK layout debug step to diagnose platforms-not-found error Android Build / build-apk (push) Failing after 3m19s Details Build and Deploy / build-and-push (push) Successful in 42s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:28:10 -07:00
Gitea CI	356dbebe57	chore(deploy): bump image to `c90c7831` [skip ci]	2026-05-14 17:28:04 +00:00
funman300	c90c783177	fix(ci): set ANDROID_HOME/NDK_HOME in workflow env block instead of GITHUB_ENV Android Build / build-apk (push) Failing after 3m23s Details Build and Deploy / build-and-push (push) Successful in 40s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:23:58 -07:00
Gitea CI	bbf4b2c14a	chore(deploy): bump image to `1f46785b` [skip ci]	2026-05-14 17:19:04 +00:00
funman300	62be72e918	fix(ci): bust SDK cache key to force fresh SDK install after prior broken cache Android Build / build-apk (push) Failing after 3m16s Details Build and Deploy / build-and-push (push) Failing after 39s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:18:57 -07:00
funman300	1f46785b31	fix(ci): add apt-get update before package install to fix exit code 100 Android Build / build-apk (push) Failing after 3m50s Details Build and Deploy / build-and-push (push) Successful in 39s Details Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-14 10:14:32 -07:00
Gitea CI	2e5d82f83c	chore(deploy): bump image to `396ba6bc` [skip ci]	2026-05-14 17:12:21 +00:00