From 2800d1440309b274ede329d41b75b1456291a34d Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Sun, 21 Jan 2024 02:45:33 -0800
Subject: [PATCH] Fix Windows Arguments Passed to Unity (#623)

* Add missing parameter, add quotes around variables, bump action versions

* Wrap quotes

* Fix upload artifact naming conflict
---
 .github/workflows/build-tests-mac.yml     |  7 +++---
 .github/workflows/build-tests-ubuntu.yml  |  9 +++++---
 .github/workflows/build-tests-windows.yml |  9 +++++---
 dist/platforms/windows/build.ps1          | 27 ++++++++++++-----------
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build-tests-mac.yml b/.github/workflows/build-tests-mac.yml
index e6ba3fbf5..75722b291 100644
--- a/.github/workflows/build-tests-mac.yml
+++ b/.github/workflows/build-tests-mac.yml
@@ -37,7 +37,7 @@ jobs:
       ###########################
       #          Cache          #
       ###########################
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ matrix.projectPath }}/Library
           key: Library-${{ matrix.projectPath }}-macos-${{ matrix.targetPlatform }}
@@ -61,6 +61,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -71,8 +72,8 @@ jobs:
       ###########################
       #          Upload         #
       ###########################
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: Build MacOS (${{ matrix.unityVersion }})
+          name: Build ${{ matrix.targetPlatform }} on MacOS (${{ matrix.unityVersion }})
           path: build
           retention-days: 14
diff --git a/.github/workflows/build-tests-ubuntu.yml b/.github/workflows/build-tests-ubuntu.yml
index 830d19218..810a2e73a 100644
--- a/.github/workflows/build-tests-ubuntu.yml
+++ b/.github/workflows/build-tests-ubuntu.yml
@@ -69,7 +69,7 @@ jobs:
       ###########################
       #          Cache          #
       ###########################
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ matrix.projectPath }}/Library
           key: Library-${{ matrix.projectPath }}-ubuntu-${{ matrix.targetPlatform }}
@@ -88,6 +88,7 @@ jobs:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -108,6 +109,7 @@ jobs:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -128,6 +130,7 @@ jobs:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -138,8 +141,8 @@ jobs:
       ###########################
       #          Upload         #
       ###########################
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: Build Ubuntu (${{ matrix.unityVersion }})
+          name: Build ${{ matrix.targetPlatform }} on Ubuntu (${{ matrix.unityVersion }})
           path: build
           retention-days: 14
diff --git a/.github/workflows/build-tests-windows.yml b/.github/workflows/build-tests-windows.yml
index da3389033..ec139eb9b 100644
--- a/.github/workflows/build-tests-windows.yml
+++ b/.github/workflows/build-tests-windows.yml
@@ -39,7 +39,7 @@ jobs:
       ###########################
       #          Cache          #
       ###########################
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ matrix.projectPath }}/Library
           key: Library-${{ matrix.projectPath }}-windows-${{ matrix.targetPlatform }}
@@ -67,6 +67,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -90,6 +91,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -112,6 +114,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
+          buildName: 'GameCI Test Build'
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
@@ -122,8 +125,8 @@ jobs:
       ###########################
       #          Upload         #
       ###########################
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: Build Windows (${{ matrix.unityVersion }})
+          name: Build ${{ matrix.targetPlatform }} on Windows (${{ matrix.unityVersion }})
           path: build
           retention-days: 14
diff --git a/dist/platforms/windows/build.ps1 b/dist/platforms/windows/build.ps1
index 5622fae69..0a85d3469 100644
--- a/dist/platforms/windows/build.ps1
+++ b/dist/platforms/windows/build.ps1
@@ -137,19 +137,20 @@ $unityArgs = @(
     "-batchmode",
     "-nographics",
     "-silent-crashes",
-    "-projectPath", $Env:UNITY_PROJECT_PATH,
-    "-executeMethod", $Env:BUILD_METHOD,
-    "-buildTarget", $Env:BUILD_TARGET,
-    "-customBuildTarget", $Env:BUILD_TARGET,
-    "-customBuildPath", $Env:CUSTOM_BUILD_PATH,
-    "-buildVersion", $Env:VERSION,
-    "-androidVersionCode", $Env:ANDROID_VERSION_CODE,
-    "-androidKeystorePass", $Env:ANDROID_KEYSTORE_PASS,
-    "-androidKeyaliasName", $Env:ANDROID_KEYALIAS_NAME,
-    "-androidKeyaliasPass", $Env:ANDROID_KEYALIAS_PASS,
-    "-androidTargetSdkVersion", $Env:ANDROID_TARGET_SDK_VERSION,
-    "-androidExportType", $Env:ANDROID_EXPORT_TYPE,
-    "-androidSymbolType", $Env:ANDROID_SYMBOL_TYPE,
+    "-customBuildName", "`"$Env:BUILD_NAME`"",
+    "-projectPath", "`"$Env:UNITY_PROJECT_PATH`"",
+    "-executeMethod", "`"$Env:BUILD_METHOD`"",
+    "-buildTarget", "`"$Env:BUILD_TARGET`"",
+    "-customBuildTarget", "`"$Env:BUILD_TARGET`"",
+    "-customBuildPath", "`"$Env:CUSTOM_BUILD_PATH`"",
+    "-buildVersion", "`"$Env:VERSION`"",
+    "-androidVersionCode", "`"$Env:ANDROID_VERSION_CODE`"",
+    "-androidKeystorePass", "`"$Env:ANDROID_KEYSTORE_PASS`"",
+    "-androidKeyaliasName", "`"$Env:ANDROID_KEYALIAS_NAME`"",
+    "-androidKeyaliasPass", "`"$Env:ANDROID_KEYALIAS_PASS`"",
+    "-androidTargetSdkVersion", "`"$Env:ANDROID_TARGET_SDK_VERSION`"",
+    "-androidExportType", "`"$Env:ANDROID_EXPORT_TYPE`"",
+    "-androidSymbolType", "`"$Env:ANDROID_SYMBOL_TYPE`"",
     "-logfile", "-"
 ) + $customParametersArray