Update actions

TokisanGames · Dec 28, 2023 · 4eea2bd · 4eea2bd
1 parent 0d014e2
commit 4eea2bd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 34 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -3,45 +3,22 @@ on: [ workflow_call, workflow_dispatch ]
 
 jobs:
   build:
-    name: ${{ matrix.name }}
+    name: 🤖 Android ${{ matrix.arch }} ${{ matrix.target }}
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - identifier: android-debug
-            name: 🤖 Android 64-bit Debug
-            target: template_debug
-            platform: android
-            arch: arm64
-
-          - identifier: android-release
-            name: 🤖 Android 64-bit Release
-            target: template_release
-            platform: android
-            arch: arm64
-
-          - identifier: android-debug
-            name: 🤖 Android 32-bit Debug
-            target: template_debug
-            platform: android
-            arch: arm32
-
-          - identifier: android-release
-            name: 🤖 Android 32-bit Release
-            target: template_release
-            platform: android
-            arch: arm32
+        platform: [android]
+        target: [debug, release]
+        arch: [arm64, arm32]
 
     steps:
       - name: Checkout Terrain3D
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          lfs: true
 
       - name: Setup Android Dependencies
-        if: startsWith(matrix.identifier, 'android-')
         uses: nttld/setup-ndk@v1
         with:
           ndk-version: r23c
@@ -53,15 +30,17 @@ jobs:
       - name: Setup Build Cache
         uses: ./.github/actions/build-cache
         with:
-          cache-name: ${{ matrix.identifier }}
+          cache-name: android-${{ matrix.arch }}-${{ matrix.target }}
         continue-on-error: true
 
       - name: Build Terrain3D
         shell: sh
         env:
             SCONS_CACHE: "${{ github.workspace }}/.scons-cache/"
+            TARGET: 'template_${{ matrix.target }}'
+            ARCH: '${{ matrix.arch }}'
         run: |
-          scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' debug_symbols=no -j2
+          scons target=$TARGET platform='${{ matrix.platform }}' arch=$ARCH debug_symbols=no -j2
 
       - name: Include Files
         shell: sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ concurrency:
 
 jobs:
   build:
-    name: ${{ matrix.name }} ${{ matrix.arch }} ${{ matrix.target }}
+    name: ${{ matrix.name }} ${{ matrix.target }}
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
@@ -31,11 +31,17 @@ jobs:
             runner: macos-latest
             platform: macos
 
-          - identifier: android
-            name: 🤖 Android
+          - identifier: android-arm64
+            name: 🤖 Android Arm64
             runner: ubuntu-20.04
             platform: android
-            arch: [arm64, arm32]
+            arch: arm64
+
+          - identifier: android-arm32
+            name: 🤖 Android Arm32
+            runner: ubuntu-20.04
+            platform: android
+            arch: arm32
 
     steps:
       - name: Checkout Terrain3D
@@ -60,7 +66,7 @@ jobs:
       - name: Setup Build Cache
         uses: ./.github/actions/build-cache
         with:
-          cache-name: ${{ matrix.identifier }}
+          cache-name: ${{ matrix.identifier }}-${{ matrix.target }}
         continue-on-error: true
 
       - name: Build Terrain3D