From 037d96060749b47c09b342978eaeaa37ffe5586e Mon Sep 17 00:00:00 2001 From: LongYinan Date: Wed, 27 Jul 2022 15:25:28 +0800 Subject: [PATCH] ci: fix self testing for Android platforms (#1248) --- .github/workflows/android-armv7.yml | 6 +++--- .github/workflows/android.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android-armv7.yml b/.github/workflows/android-armv7.yml index ada64904..0a18ff1e 100644 --- a/.github/workflows/android-armv7.yml +++ b/.github/workflows/android-armv7.yml @@ -24,7 +24,7 @@ jobs: check-latest: true - name: List NDK Home - run: ls -R "${ANDROID_NDK_HOME}" + run: ls -R "${ANDROID_NDK_LATEST_HOME}" - name: Install uses: actions-rs/toolchain@v1 @@ -57,8 +57,8 @@ jobs: - name: Cross build run: | - export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang" + export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang" yarn build:test:android:armv7 du -sh examples/napi/index.node - ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip examples/napi/index.node + ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip examples/napi/index.node du -sh examples/napi/index.node diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 968091b0..c11c8160 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -24,7 +24,7 @@ jobs: check-latest: true - name: List NDK Home - run: ls -R "${ANDROID_NDK_HOME}" + run: ls -R "${ANDROID_NDK_LATEST_HOME}" - name: Install uses: actions-rs/toolchain@v1 @@ -57,5 +57,5 @@ jobs: - name: Cross build native tests run: | - export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang" + export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang" yarn build:test:android