fix(ci): use fresh /opt/android-sdk path to avoid container ENV conflict
Remove SDK detection logic and install directly to /opt/android-sdk, matching the release workflow. The container Docker image has ANDROID_HOME baked in at /usr/local/lib/android/sdk; installing there with sudo while cargo-apk resolves ANDROID_HOME from the image ENV created a divergence. Using a controlled path we own eliminates that class of conflict entirely. Add SDK cache shared with the release workflow (same key prefix v2-). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -12,6 +12,8 @@ on:
|
|||||||
- '**.md'
|
- '**.md'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
ANDROID_HOME: /opt/android-sdk
|
||||||
|
ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653
|
||||||
NDK_VERSION: "25.2.9519653"
|
NDK_VERSION: "25.2.9519653"
|
||||||
BUILD_TOOLS_VERSION: "34.0.0"
|
BUILD_TOOLS_VERSION: "34.0.0"
|
||||||
|
|
||||||
@@ -27,59 +29,36 @@ jobs:
|
|||||||
id: meta
|
id: meta
|
||||||
run: echo "sha=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"
|
run: echo "sha=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
# ── Probe the container's existing Android SDK ─────────────────────
|
# ── System dependencies ────────────────────────────────────────────
|
||||||
- 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
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
sudo apt-get update -y
|
||||||
sudo apt-get install -y openjdk-17-jdk-headless unzip jq
|
sudo apt-get install -y openjdk-17-jdk-headless unzip
|
||||||
|
|
||||||
# ── Install missing SDK components if needed ───────────────────────
|
# ── Android SDK (shared cache key with release workflow) ──────────
|
||||||
- name: Install SDK platform and NDK
|
- name: Cache Android SDK
|
||||||
env:
|
uses: actions/cache@v4
|
||||||
ANDROID_SDK: ${{ steps.sdk.outputs.sdk_path }}
|
id: sdk-cache
|
||||||
|
with:
|
||||||
|
path: ${{ env.ANDROID_HOME }}
|
||||||
|
key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
|
||||||
|
|
||||||
|
- name: Install Android SDK + NDK
|
||||||
|
if: steps.sdk-cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
# Ensure sdkmanager is on PATH
|
sudo mkdir -p "$ANDROID_HOME/cmdline-tools"
|
||||||
SDKMAN="$ANDROID_SDK/cmdline-tools/latest/bin/sdkmanager"
|
curl -sL \
|
||||||
if [ ! -f "$SDKMAN" ]; then
|
"https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
|
||||||
echo "sdkmanager not found — installing cmdline-tools"
|
-o /tmp/cmdtools.zip
|
||||||
mkdir -p "$ANDROID_SDK/cmdline-tools"
|
unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
|
||||||
curl -sL \
|
sudo mv /tmp/cmdtools/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest"
|
||||||
"https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
|
yes | sudo "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
||||||
-o /tmp/cmdtools.zip
|
--sdk_root="$ANDROID_HOME" --licenses > /dev/null 2>&1 || true
|
||||||
unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
|
sudo "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
||||||
sudo mv /tmp/cmdtools/cmdline-tools "$ANDROID_SDK/cmdline-tools/latest"
|
--sdk_root="$ANDROID_HOME" \
|
||||||
fi
|
"build-tools;$BUILD_TOOLS_VERSION" \
|
||||||
|
"platforms;android-34" \
|
||||||
yes | sudo "$SDKMAN" --sdk_root="$ANDROID_SDK" --licenses \
|
"ndk;$NDK_VERSION"
|
||||||
> /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 ─────────────────────────────────────────────────
|
# ── Rust toolchain ─────────────────────────────────────────────────
|
||||||
- name: Install Rust stable
|
- name: Install Rust stable
|
||||||
|
|||||||
Reference in New Issue
Block a user