Skip to content

Commit 396fd3a

Browse files
Fix CI NDK install: extract to temp dir and set ANDROID_NDK_HOME
The previous approach assumed the zip extracts to android-ndk-r28/ and relied on sort -V to pick the right NDK. This failed because the Makefile still picked the runner's pre-installed NDK 27.3. Now: extract to /tmp, glob-move the extracted directory, and explicitly set ANDROID_NDK_HOME via GITHUB_ENV so the Makefile uses it directly.
1 parent be9c3e9 commit 396fd3a

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ jobs:
4646

4747
- name: Install Android NDK
4848
run: |
49-
mkdir -p "$ANDROID_HOME/ndk"
5049
wget -q "https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux.zip" -O /tmp/ndk.zip
51-
unzip -q /tmp/ndk.zip -d "$ANDROID_HOME/ndk/"
52-
mv "$ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}" "$ANDROID_HOME/ndk/${ANDROID_NDK_DIR_NAME}"
50+
unzip -q /tmp/ndk.zip -d /tmp/ndk-extract/
51+
ls /tmp/ndk-extract/
52+
mkdir -p "$ANDROID_HOME/ndk"
53+
mv /tmp/ndk-extract/android-ndk-* "$ANDROID_HOME/ndk/${ANDROID_NDK_DIR_NAME}"
54+
echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/${ANDROID_NDK_DIR_NAME}" >> "$GITHUB_ENV"
5355
5456
- name: Cross-compile examples for Android arm64
5557
run: make check-examples
@@ -82,10 +84,11 @@ jobs:
8284
8385
- name: Install Android NDK
8486
run: |
85-
mkdir -p "$ANDROID_HOME/ndk"
8687
wget -q "https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux.zip" -O /tmp/ndk.zip
87-
unzip -q /tmp/ndk.zip -d "$ANDROID_HOME/ndk/"
88-
mv "$ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}" "$ANDROID_HOME/ndk/${ANDROID_NDK_DIR_NAME}"
88+
unzip -q /tmp/ndk.zip -d /tmp/ndk-extract/
89+
mkdir -p "$ANDROID_HOME/ndk"
90+
mv /tmp/ndk-extract/android-ndk-* "$ANDROID_HOME/ndk/${ANDROID_NDK_DIR_NAME}"
91+
echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/${ANDROID_NDK_DIR_NAME}" >> "$GITHUB_ENV"
8992
9093
- name: Create AVD
9194
run: |

0 commit comments

Comments
 (0)