fix(ci): detect existing container SDK before installing, set ANDROID_HOME via GITHUB_ENV

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-14 10:53:14 -07:00
parent 3cffbc2c51
commit 01d6b27e61
1 changed files with 49 additions and 47 deletions
@@ -12,8 +12,6 @@ on:
      - '**.md'

 env:
-  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"

@@ -29,38 +27,61 @@ jobs:
        id: meta
        run: echo "sha=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"

-      # ── Android SDK + NDK ──────────────────────────────────────────────
-      # Cache the entire SDK root so subsequent runs skip the ~2 GB download.
-      - name: Cache Android SDK
-        uses: actions/cache@v4
-        id: sdk-cache
-        with:
-          path: ${{ env.ANDROID_HOME }}
-          key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
+      # ── Probe the container's existing Android SDK ─────────────────────
+      - name: Detect Android SDK
+        id: sdk
+        run: |
+          # Gitea/GitHub ubuntu-latest runners may already have an Android
+          # SDK at /usr/local/lib/android/sdk. If it has the platform and
+          # NDK we need we use it directly; otherwise we install our own.
+          DEFAULT="${ANDROID_HOME:-/usr/local/lib/android/sdk}"
+          echo "container default ANDROID_HOME: $DEFAULT"
+          echo "sdk_path=$DEFAULT" >> "$GITHUB_OUTPUT"
+          ls "$DEFAULT/platforms/" 2>/dev/null || echo "(no platforms/ in default)"
+          ls "$DEFAULT/ndk/" 2>/dev/null || echo "(no ndk/ in default)"

+      # ── System dependencies (always needed for build tools + signing) ──
      - name: Install system dependencies
        run: |
          sudo apt-get update -y
-          sudo apt-get install -y openjdk-17-jdk-headless unzip
+          sudo apt-get install -y openjdk-17-jdk-headless unzip jq

-      - name: Install Android SDK + NDK
-        if: steps.sdk-cache.outputs.cache-hit != 'true'
+      # ── Install missing SDK components if needed ───────────────────────
+      - name: Install SDK platform and NDK
+        env:
+          ANDROID_SDK: ${{ steps.sdk.outputs.sdk_path }}
        run: |
-          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_HOME/cmdline-tools/latest"
-          # Accept all SDK licences non-interactively.
-          yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" --licenses \
-            > /dev/null 2>&1 || true
-          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" \
-            "build-tools;$BUILD_TOOLS_VERSION" \
-            "platforms;android-34" \
-            "ndk;$NDK_VERSION"
+          # Ensure sdkmanager is on PATH
+          SDKMAN="$ANDROID_SDK/cmdline-tools/latest/bin/sdkmanager"
+          if [ ! -f "$SDKMAN" ]; then
+            echo "sdkmanager not found — installing cmdline-tools"
+            mkdir -p "$ANDROID_SDK/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
+            sudo mv /tmp/cmdtools/cmdline-tools "$ANDROID_SDK/cmdline-tools/latest"
+          fi

-# ── Rust toolchain ─────────────────────────────────────────────────
+          yes | sudo "$SDKMAN" --sdk_root="$ANDROID_SDK" --licenses \
+            > /dev/null 2>&1 || true
+
+          NEEDS=""
+          [ ! -f "$ANDROID_SDK/platforms/android-34/android.jar" ] && NEEDS="$NEEDS platforms;android-34"
+          [ ! -d "$ANDROID_SDK/ndk/$NDK_VERSION" ] && NEEDS="$NEEDS ndk;$NDK_VERSION"
+          [ ! -d "$ANDROID_SDK/build-tools/$BUILD_TOOLS_VERSION" ] && NEEDS="$NEEDS build-tools;$BUILD_TOOLS_VERSION"
+
+          if [ -n "$NEEDS" ]; then
+            echo "Installing:$NEEDS"
+            sudo "$SDKMAN" --sdk_root="$ANDROID_SDK" $NEEDS
+          else
+            echo "All SDK components already present"
+          fi
+
+          echo "ANDROID_HOME=$ANDROID_SDK"     >> "$GITHUB_ENV"
+          echo "ANDROID_NDK_HOME=$ANDROID_SDK/ndk/$NDK_VERSION" >> "$GITHUB_ENV"
+
+      # ── Rust toolchain ─────────────────────────────────────────────────
      - name: Install Rust stable
        run: |
          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
@@ -99,32 +120,13 @@ 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: |
-          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
+        run: cargo apk build --package solitaire_app --lib

      # ── Artifact ───────────────────────────────────────────────────────
      - name: Upload APK