From 46773f85abfe97f688d08456ce4c57941f14bc15 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Sun, 18 Feb 2024 20:44:44 -0800
Subject: [PATCH] Fix build matrix and upload name

---
 .github/workflows/build-tests-ubuntu.yml | 25 +++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-tests-ubuntu.yml b/.github/workflows/build-tests-ubuntu.yml
index 3a9675776..062623bc5 100644
--- a/.github/workflows/build-tests-ubuntu.yml
+++ b/.github/workflows/build-tests-ubuntu.yml
@@ -61,28 +61,37 @@ jobs:
         buildWithIl2cpp:
           - false
           - true
+        additionalParameters:
+          - -param value
+          - -standaloneBuildSubtarget Server
         # Skipping configurations that are not supported
         exclude:
+          # No il2cpp support on Linux Host
           - targetPlatform: StandaloneOSX
             buildWithIl2cpp: true
           - targetPlatform: StandaloneWindows64
             buildWithIl2cpp: true
+          # Only builds with Il2cpp
           - targetPlatform: iOS
             buildWithIl2cpp: false
           - targetPlatform: Android
             buildWithIl2cpp: false
           - targetPlatform: WebGL
             buildWithIl2cpp: false
-        include:
-          - targetPlatform: StandaloneLinux64
+          # No dedicated server support
+          - targetPlatform: WebGL
             additionalParameters: -standaloneBuildSubtarget Server
-            buildWithIl2cpp: true
-          - targetPlatform: StandaloneLinux64
+          - targetPlatform: Android
             additionalParameters: -standaloneBuildSubtarget Server
-            buildWithIl2cpp: false
+          - targetPlatform: iOS
+            additionalParameters: -standaloneBuildSubtarget Server
+          # No dedicated server support on Linux Host
+          - targetPlatform: StandaloneOSX
+            additionalParameters: -standaloneBuildSubtarget Server
+          # No il2cpp dedicated server support on Linux Host
           - targetPlatform: StandaloneWindows64
             additionalParameters: -standaloneBuildSubtarget Server
-            buildWithIl2cpp: false
+            buildWithIl2cpp: true
 
     steps:
       - name: Clear Space for Android Build
@@ -182,6 +191,8 @@ jobs:
       ###########################
       - uses: actions/upload-artifact@v4
         with:
-          name: Build ${{ matrix.targetPlatform }} on Ubuntu (${{ matrix.unityVersion }})
+          name:
+            'Build ${{ matrix.targetPlatform }} on Ubuntu (${{ matrix.unityVersion }}_il2cpp_${{ matrix.buildWithIl2cpp
+            }}_params_${{ matrix.additionalParameters }})'
           path: build
           retention-days: 14