Update ci.yml

unit-mesh · Nov 9, 2023 · 6d54de0 · 6d54de0
1 parent 91de6e2
commit 6d54de0
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,15 +22,13 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r26b
-          local-cache: true
-          add-to-path: true
-
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
+        uses: amyu/setup-android@v3
+        with:
+          sdk-version: 34
+          build-tools-version: 34.0.0
+          cmake-version: 3.10.2.4988404
+          ndk-version: 26.1.10909125
       - name: checkout
         uses: actions/checkout@v2
 
@@ -54,9 +52,9 @@ jobs:
       - name: build android
         run: ./gradlew cargoBuild
         env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-          TOOLCHAIN: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/darwin-x86_64
-          RANLIB: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib
+          ANDROID_NDK_HOME: ${{ ANDROID_SDK_ROOT }}/ndk
+          TOOLCHAIN: ${{ ANDROID_NDK_HOME }}/toolchains/llvm/prebuilt/darwin-x86_64
+          RANLIB: ${{ ANDROID_NDK_HOME }}/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib
 
       - name: build iso
         run: cargo build --target=aarch64-apple-ios && cargo build --target=x86_64-apple-ios