Combine android platforms, upgrade

TokisanGames · Dec 27, 2024 · 381174f · 381174f
1 parent 248aadb
commit 381174f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Android Dependencies
         uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r23c
+          ndk-version: r26d
           link-to-sdk: true
 
       - name: Setup Base Dependencies

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        identifier: [linux, windows, macos, ios, android-arm32, android-arm64]
+        identifier: [linux, windows, macos, ios, android]
         target: [debug, release]
         include:
           - identifier: linux
@@ -44,17 +44,11 @@ jobs:
             runner: macos-latest
             arch: universal
 
-          - identifier: android-arm64
+          - identifier: android
             platform: android
-            name: 🤖 Android Arm64
+            name: 🤖 Android Arm
             runner: ubuntu-24.04
-            arch: arm64
-
-          - identifier: android-arm32
-            platform: android
-            name: 🤖 Android Arm32
-            runner: ubuntu-24.04
-            arch: arm32
+            arch: [arm32, arm64]
 
     steps:
       - name: Checkout Terrain3D
@@ -70,7 +64,7 @@ jobs:
         if: ${{ matrix.platform == 'android' }}
         uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r23c
+          ndk-version: r26d
           link-to-sdk: true
 
       - name: Setup Base Dependencies