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

@@ -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

.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

.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

dist/index.js

@@ -7304,6 +7304,7 @@ class SetupMac {
         process.env.ANDROID_SYMBOL_TYPE = buildParameters.androidSymbolType;
         process.env.CUSTOM_PARAMETERS = buildParameters.customParameters;
         process.env.CHOWN_FILES_TO = buildParameters.chownFilesTo;
+        process.env.MANUAL_EXIT = buildParameters.manualExit.toString();
     }
 }
 SetupMac.unityHubBasePath = `/Applications/"Unity Hub.app"`;

dist/platforms/mac/steps/build.sh

@@ -129,7 +129,7 @@ echo ""
 
 /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
   -logFile - \
-  -quit \
+  $( [ "${MANUAL_EXIT}" == "true" ] || echo "-quit" ) \
   -batchmode \
   -nographics \
   -username "$UNITY_EMAIL" \

dist/platforms/windows/build.ps1

@@ -137,19 +137,20 @@ $unityArgs = @(
     "-batchmode",
     "-nographics",
     "-silent-crashes",
-    "-projectPath", $Env:UNITY_PROJECT_PATH,
+    "-customBuildName", "`"$Env:BUILD_NAME`"",
-    "-executeMethod", $Env:BUILD_METHOD,
+    "-projectPath", "`"$Env:UNITY_PROJECT_PATH`"",
-    "-buildTarget", $Env:BUILD_TARGET,
+    "-executeMethod", "`"$Env:BUILD_METHOD`"",
-    "-customBuildTarget", $Env:BUILD_TARGET,
+    "-buildTarget", "`"$Env:BUILD_TARGET`"",
-    "-customBuildPath", $Env:CUSTOM_BUILD_PATH,
+    "-customBuildTarget", "`"$Env:BUILD_TARGET`"",
-    "-buildVersion", $Env:VERSION,
+    "-customBuildPath", "`"$Env:CUSTOM_BUILD_PATH`"",
-    "-androidVersionCode", $Env:ANDROID_VERSION_CODE,
+    "-buildVersion", "`"$Env:VERSION`"",
-    "-androidKeystorePass", $Env:ANDROID_KEYSTORE_PASS,
+    "-androidVersionCode", "`"$Env:ANDROID_VERSION_CODE`"",
-    "-androidKeyaliasName", $Env:ANDROID_KEYALIAS_NAME,
+    "-androidKeystorePass", "`"$Env:ANDROID_KEYSTORE_PASS`"",
-    "-androidKeyaliasPass", $Env:ANDROID_KEYALIAS_PASS,
+    "-androidKeyaliasName", "`"$Env:ANDROID_KEYALIAS_NAME`"",
-    "-androidTargetSdkVersion", $Env:ANDROID_TARGET_SDK_VERSION,
+    "-androidKeyaliasPass", "`"$Env:ANDROID_KEYALIAS_PASS`"",
-    "-androidExportType", $Env:ANDROID_EXPORT_TYPE,
+    "-androidTargetSdkVersion", "`"$Env:ANDROID_TARGET_SDK_VERSION`"",
-    "-androidSymbolType", $Env:ANDROID_SYMBOL_TYPE,
+    "-androidExportType", "`"$Env:ANDROID_EXPORT_TYPE`"",
+    "-androidSymbolType", "`"$Env:ANDROID_SYMBOL_TYPE`"",
     "-logfile", "-"
 ) + $customParametersArray
 

src/model/platform-setup/setup-mac.ts

@@ -187,6 +187,7 @@ class SetupMac {
     process.env.ANDROID_SYMBOL_TYPE = buildParameters.androidSymbolType;
     process.env.CUSTOM_PARAMETERS = buildParameters.customParameters;
     process.env.CHOWN_FILES_TO = buildParameters.chownFilesTo;
+    process.env.MANUAL_EXIT = buildParameters.manualExit.toString();
   }
 }