From caaeaacc83998acc96a3694d03e53333ef0a0ad4 Mon Sep 17 00:00:00 2001 From: ZhangLe2016 <156590889+ZhangLe2016@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:23:44 +0800 Subject: [PATCH] [github-actions] fix existing checks failures due to workflows settings (#300) --- .github/workflows/android-app-build.yml | 2 +- .github/workflows/android-app-release.yml | 6 +++--- .github/workflows/build.yml | 4 ++-- script/bootstrap.sh | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android-app-build.yml b/.github/workflows/android-app-build.yml index 447aa138..bc140c10 100644 --- a/.github/workflows/android-app-build.yml +++ b/.github/workflows/android-app-build.yml @@ -50,7 +50,7 @@ jobs: - name: Build run: | cd android - ANDROID_ABI=${{ matrix.android-abi }} ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "24.*") ./build-commissioner-libs.sh + ANDROID_ABI=${{ matrix.android-abi }} ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh cd openthread_commissioner ./gradlew build - name: Tests diff --git a/.github/workflows/android-app-release.yml b/.github/workflows/android-app-release.yml index 6e3440fb..a0db0c7b 100644 --- a/.github/workflows/android-app-release.yml +++ b/.github/workflows/android-app-release.yml @@ -53,8 +53,8 @@ jobs: - name: Build APK run: | cd android - ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "24.*") ./build-commissioner-libs.sh - ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "24.*") ./build-commissioner-libs.sh + ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh + ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh cd openthread_commissioner ./gradlew assembleDebug @@ -62,7 +62,7 @@ jobs: ot-commissioner-app-debug-${{ steps.check_release_version.outputs.release_version }}.apk - name: Upload APK for release if: success() && github.repository == 'openthread/ot-commissioner' && github.event_name != 'pull_request' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ot-commissioner-app-debug-v${{ steps.check_release_version.outputs.release_version }} path: ./android/openthread_commissioner/ot-commissioner-app-debug-*.apk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a5532ef..6c9b2ad6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,8 +159,8 @@ jobs: - name: Build run: | cd android - ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "24.*") ./build-commissioner-libs.sh - ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "24.*") ./build-commissioner-libs.sh + ANDROID_ABI=armeabi-v7a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh + ANDROID_ABI=arm64-v8a ANDROID_NDK_HOME=$(find $ANDROID_HOME/ndk -name "26.*") ./build-commissioner-libs.sh java-binding: runs-on: macos-12 diff --git a/script/bootstrap.sh b/script/bootstrap.sh index c44c919b..f817cba5 100755 --- a/script/bootstrap.sh +++ b/script/bootstrap.sh @@ -130,6 +130,9 @@ elif [ "$(uname)" = "Darwin" ]; then brew unlink cmake brew install cmake --HEAD } + + ## Install coreutils for realpath + brew install coreutils else echo "platform $(uname) is not fully supported" exit 1