Parity Fixes with Test Runner (QOL Changes) (#607)

* Fix missed directory change that isn't used anymore * Fixes, improvements, and cleanup while reconciling test runner scripts * Additional cleanup * Fix possible hang * Don't mislead with activation server on windows * Update node version
2023-12-12 22:10:57 -08:00
parent 9406bce875
commit ff23166e30
13 changed files with 127 additions and 37 deletions
--- a/dist/platforms/windows/activate.ps1
+++ b/dist/platforms/windows/activate.ps1
@@ -6,11 +6,64 @@ Write-Output "#        Activating       #"
 Write-Output "###########################"
 Write-Output ""

-& "$Env:UNITY_PATH/Editor/Unity.exe" -batchmode -quit -nographics `
-                                     -username $Env:UNITY_EMAIL `
-                                     -password $Env:UNITY_PASSWORD `
-                                     -serial $Env:UNITY_SERIAL `
-                                     -projectPath "c:/BlankProject" `
-                                     -logfile - | Out-Host
+if ( ($null -ne ${env:UNITY_SERIAL}) -and ($null -ne ${env:UNITY_EMAIL}) -and ($null -ne ${env:UNITY_PASSWORD}) )
+{
+  #
+  # SERIAL LICENSE MODE
+  #
+  # This will activate unity, using the serial activation process.
+  #
+  Write-Output "Requesting activation"

-$ACTIVATION_EXIT_CODE = $LASTEXITCODE
+  $ACTIVATION_OUTPUT = Start-Process -FilePath "$Env:UNITY_PATH/Editor/Unity.exe" `
+                                     -NoNewWindow `
+                                     -PassThru `
+                                     -ArgumentList  "-batchmode `
+                                                     -quit `
+                                                     -nographics `
+                                                     -username $Env:UNITY_EMAIL `
+                                                     -password $Env:UNITY_PASSWORD `
+                                                     -serial $Env:UNITY_SERIAL `
+                                                     -projectPath c:/BlankProject `
+                                                     -logfile -"
+
+  # Cache the handle so exit code works properly
+  # https://stackoverflow.com/questions/10262231/obtaining-exitcode-using-start-process-and-waitforexit-instead-of-wait
+  $unityHandle = $ACTIVATION_OUTPUT.Handle
+
+  while ($true) {
+      if ($ACTIVATION_OUTPUT.HasExited) {
+        $ACTIVATION_EXIT_CODE = $ACTIVATION_OUTPUT.ExitCode
+
+        # Display results
+        if ($ACTIVATION_EXIT_CODE -eq 0)
+        {
+            Write-Output "Activation Succeeded"
+        } else
+        {
+            Write-Output "Activation failed, with exit code $ACTIVATION_EXIT_CODE"
+        }
+
+        break
+      }
+
+      Start-Sleep -Seconds 3
+  }
+}
+else
+{
+    #
+    # NO LICENSE ACTIVATION STRATEGY MATCHED
+    #
+    # This will exit since no activation strategies could be matched.
+    #
+    Write-Output "License activation strategy could not be determined."
+    Write-Output ""
+    Write-Output "Visit https://game.ci/docs/github/activation for more"
+    Write-Output "details on how to set up one of the possible activation strategies."
+
+    Write-Output "::error ::No valid license activation strategy could be determined. Make sure to provide UNITY_EMAIL, UNITY_PASSWORD, and either a UNITY_SERIAL \
+or UNITY_LICENSE. See more info at https://game.ci/docs/github/activation"
+
+    $ACTIVATION_EXIT_CODE = 1;
+}