Update actions

TokisanGames · Dec 28, 2023 · 0d014e2 · 0d014e2
1 parent e748caf
commit 0d014e2
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,37 +7,33 @@ concurrency:
 
 jobs:
   build:
-    name: ${{ matrix.name }} ${{ matrix.arch }}
+    name: ${{ matrix.name }} ${{ matrix.arch }} ${{ matrix.target }}
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
-        release: [debug, release]
+        target: [debug, release]
         include:
-          - identifier: linux-${{ matrix.release }}
-            name: 🐧 Linux ${{ matrix.release }}
+          - identifier: linux
+            name: 🐧 Linux
             runner: ubuntu-20.04
-            target: template_${{ matrix.release }}
             platform: linux
             arch: x86_64
 
-          - identifier: windows-${{ matrix.release }}
-            name: 🪟 Windows ${{ matrix.release }}
+          - identifier: windows
+            name: 🪟 Windows
             runner: ubuntu-20.04
-            target: template_${{ matrix.release }}
             platform: windows
             arch: x86_64
 
-          - identifier: macos-${{ matrix.release }}
-            name: 🍎 macOS ${{ matrix.release }}
+          - identifier: macos
+            name: 🍎 macOS
             runner: macos-latest
-            target: template_${{ matrix.release }}
             platform: macos
 
-          - identifier: android-${{ matrix.release }}
-            name: 🤖 Android ${{ matrix.release }}
+          - identifier: android
+            name: 🤖 Android
             runner: ubuntu-20.04
-            target: template_${{ matrix.release}}
             platform: android
             arch: [arm64, arm32]
 
@@ -48,11 +44,11 @@ jobs:
           submodules: recursive
 
       - name: Setup Windows Dependencies
-        if: startsWith(matrix.identifier, 'windows-')
+        if: startsWith(matrix.identifier, 'windows')
         uses: ./.github/actions/windows-deps
 
       - name: Setup Android Dependencies
-        if: startsWith(matrix.identifier, 'android-')
+        if: startsWith(matrix.identifier, 'android')
         uses: nttld/setup-ndk@v1
         with:
           ndk-version: r23c
@@ -70,13 +66,14 @@ jobs:
       - name: Build Terrain3D
         env:
             SCONS_CACHE: "${{ github.workspace }}/.scons-cache/"
-            ARCH: ${{ matrix.arch }}
+            TARGET: 'template_${{ matrix.target }}'
+            ARCH: '${{ matrix.arch }}'
         shell: sh
         run: |
-            scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='$ARCH' debug_symbols=no -j2
+            scons target=$TARGET platform='${{ matrix.platform }}' arch=$ARCH debug_symbols=no -j2
 
       - name: Strip Libraries (Windows/Linux)
-        if: startsWith(matrix.identifier, 'windows-') || startsWith(matrix.identifier, 'linux-')
+        if: startsWith(matrix.identifier, 'windows') || startsWith(matrix.identifier, 'linux')
         shell: sh
         run: |
           ls -l project/addons/terrain_3d/bin/