[github-actions] fix existing checks failures due to workflows settin…

…gs (#300)
openthread · Oct 9, 2024 · caaeaac · caaeaac
1 parent 64928ae
commit caaeaac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -53,16 +53,16 @@ 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
 
           cp app/build/outputs/apk/debug/app-debug.apk \
              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
@@ -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
@@ -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