From ca5cfb23df999a3a8521a4030130cb9e95701953 Mon Sep 17 00:00:00 2001 From: Rajesh Malviya Date: Sun, 25 Aug 2024 23:46:10 +0530 Subject: [PATCH 1/2] remove unnecessary `fail-fast` flag for non-matrix job --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b16be5f..8697a9c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,6 @@ jobs: integrity-build: name: Code integrity checks runs-on: ubuntu-latest - strategy: - fail-fast: false steps: - uses: actions/checkout@v4 with: From 50f8e05318d7539fae00722ad3ce2d6cce6c08dc Mon Sep 17 00:00:00 2001 From: Rajesh Malviya Date: Sun, 25 Aug 2024 23:56:56 +0530 Subject: [PATCH 2/2] update ndk --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8697a9c8..69ed8e7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: target: aarch64-linux-android setup_env: | set -x - ANDROID_NDK_HOME=$ANDROID_HOME/ndk/25.2.9519653 + ANDROID_NDK_HOME=$ANDROID_HOME/ndk/27.0.12077973 CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang echo "CC=$CC" >> $GITHUB_ENV @@ -91,7 +91,6 @@ jobs: echo "CLANG_PATH=$CC" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=$CC" >> $GITHUB_ENV - echo "LIBCLANG_PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/lib64/libclang.so.13" >> $GITHUB_ENV echo "LLVM_CONFIG_PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-config" >> $GITHUB_ENV echo "BINDGEN_EXTRA_CLANG_ARGS='-isysroot $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot'" >> $GITHUB_ENV - name: Android armv7 @@ -99,7 +98,7 @@ jobs: target: armv7-linux-androideabi setup_env: | set -x - ANDROID_NDK_HOME=$ANDROID_HOME/ndk/25.2.9519653 + ANDROID_NDK_HOME=$ANDROID_HOME/ndk/27.0.12077973 CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang echo "CC=$CC" >> $GITHUB_ENV @@ -107,7 +106,6 @@ jobs: echo "CLANG_PATH=$CC" >> $GITHUB_ENV echo "CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=$CC" >> $GITHUB_ENV - echo "LIBCLANG_PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/lib64/libclang.so.13" >> $GITHUB_ENV echo "LLVM_CONFIG_PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-config" >> $GITHUB_ENV echo "BINDGEN_EXTRA_CLANG_ARGS='-isysroot $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot'" >> $GITHUB_ENV # iOS