From ff23166e3002a9f3f869621650dc992e657e17ce Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:10:57 -0800
Subject: [PATCH] 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
---
 .github/pull_request_template.md              |   3 +
 action.yml                                    |   2 +-
 dist/BlankProject/Packages/.DS_Store          | Bin 6148 -> 0 bytes
 dist/index.js                                 | Bin 22176656 -> 22176750 bytes
 dist/index.js.map                             | Bin 14647500 -> 14647634 bytes
 dist/platforms/ubuntu/steps/activate.sh       |   8 +--
 dist/platforms/ubuntu/steps/return_license.sh |  10 +--
 dist/platforms/windows/activate.ps1           |  67 ++++++++++++++++--
 dist/platforms/windows/build.ps1              |   8 +--
 dist/platforms/windows/return_license.ps1     |  50 +++++++++++--
 dist/platforms/windows/set_gitcredential.ps1  |   4 +-
 src/model/docker.ts                           |   3 +
 src/model/image-tag.ts                        |   2 +-
 13 files changed, 122 insertions(+), 35 deletions(-)
 delete mode 100644 dist/BlankProject/Packages/.DS_Store

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9396d6cb..b00128c5 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -12,6 +12,9 @@
 
 #### Successful Workflow Run Link
 
+PRs don't have access to secrets so you will need to provide a link to a successful run of the workflows from your own
+repo.
+
 - ...
 
 #### Checklist
diff --git a/action.yml b/action.yml
index 02b4d3f1..e0ccba40 100644
--- a/action.yml
+++ b/action.yml
@@ -270,5 +270,5 @@ branding:
   icon: 'box'
   color: 'gray-dark'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'
diff --git a/dist/BlankProject/Packages/.DS_Store b/dist/BlankProject/Packages/.DS_Store
deleted file mode 100644
index d2dd41223ab5a5243ffc32e48f75b2f0de298042..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJxc>Y5PhpD0ul&TmRs5=Slb*S7S{d&P5dBw$qCW^{*J#=-<w&*)2)NZ4D7tw
z*_qkf2e%&p((Lv24448Kvk8-oipX6Z+AG1rWHs(_hb>-kipNT!zv$ApPq4-fHdx{N
z_ixc*bJ=#wMcXYHC5q13j^9ma0f%^I<`PfT54QFbw9J!79Mo#O{itDuLInfCKrj#t
z1Oq!`fM>R3eBc;57zhS}fiDKMKV&vxQ?Pfmt%FL}XN`}9656^b3v<DyVDHEgO7c{q
zr>646NS;oAE^$r4-qF*MY-ZLeGk-o_lFd$kws54zF?28x3=A3A_wH2Z{{?@U>LY)c
z61`v`82D!lq|y9pKI5Xw+4^gFI%_lAHJe0ny$lNN!6kql?ITAv=;K*7<C=oKqpHYn
Q>BP7Q7$Kp8fgLdL0j>2cjQ{`u

diff --git a/dist/index.js b/dist/index.js
index b63cde657d8e434346273c5915f2f02ecb5a0541..44232ca2839abce4310547045e9b8ea6a0e45026 100644
GIT binary patch
delta 1521
zcmWmES6mGM0EO}2&820hLQ<$uDKi-%DkQS^N-|67W|aupqX^gDGkb4k@4ffld++g`
zhyV9_-cI_l6E<&=l4?k`NX@a;IL*PFlAUZcZ?rWS&FLYwcIND7Mo*9MxTyGugx<0J
zTunnv2~jcLu5L+j@v)InCX-KGbVNdr*!Y-aZ?o@{MEi_DXGe3Im$lW7We&z&kr@X=
zi;vArG$JQ*!4g)mh7D|y8+niy`H&w4P!M(~1baBZ5rt6%Md5^EaE7*A;EEC`iBfQb
zJ3LStWl$EL@PaqW!3Vx5j|!-WN~nw~@IzJjqZ+EC25KSzwNM*%5Qw^{hadza1ohDX
z4H1e)2t#8uK{%SC8JeR7TA~$NqYc`k9onM<I-(OgqYJts0^Jaa?ubGU^h7W8Mj!M=
zG-A*Xv4}%|#KVLH48TAP!e9(RB9br^$ry&=NWln<#3-a<G{#^o#$h}rU?L`AGNvF6
z>6nUX$iQ^Wz)YAi3$rl?b1@I|u>cFP2#c`<OR)^gu>vcx3agQcHCT&vSdR_Zh)vjx
zE!c`}*p408iCx%@J=lwV*pDn^;{Xog5Dw!Aj^Y@O;{;CP6i(v|&f*--;{q<?5-#Hk
zuHqW5;|6Zx7H;DX?&2Qq;{hJx5gy|Sp5hsv;{{&g6<*^F-r^nJ;{!h86F%b$zTz9c
z;|G4?7k=Xp{^H-n%tS*P6bmJXVpMV}xfDyqO0iaK6k8>?l1Is_<Wur11(bq{ol;1#
zR~!^arLa;&DXKUr#S~|yxZ<L?DkYSXN-4!naaTN)(n=Yntm3J7Dc(vs#Ygc~$}1I=
zib^G=vQkCyQ>rTdN;RdrQbVb!1SqwX+DaWIP^qibQ-YLWB}A#OG*B8Up-LkqOlhn%
PQNop`hAjTX@bvkA9ERow

delta 1506
zcmWmES6q$(7>4m*M2j*jqr7IBUm+@#P4?b9FC{8p$w-9kEoAS#_ueae@4aPb?{VD+
z|Lfp6xzC<=siz#LATh}%DMM1mZMM@~Q#=<YIHja}JJ{{?b+g?aYB4Mp!^_9Z2s5pw
zVKt+zW{epb8)L+VnMU`h&<NA2Ym^aZT4TbaB9jwOdXBb_w?!soh8^tT07p0>3$nr)
zF35)L$bp>5h1_t38{Clxd65tK;Q?(GfPsQ2gu*C-q9_J0c%wK<pd?D6G|IpNANZmy
z%Aq{`PyrR;j{pRs5-Ot#f)I?VsD|pOftsj=+NguN2ths6M*}oOBQ!=6G(|HsM+>w>
zE3`%%v_(6#M+bC7Cv-*^bVWCWqB~6VKu?4r9K8^M-spo!L?Ie|VMPpL(GPLxj{z8n
zL5Rm-Bwz@JA`!zd93zl~kr;*17=y7Ghw+$ziI{}Rn1ZR8hGa~~49r9dW??qwU@qoi
zJ{Djh7GW`#U@4YiIaXjLR$(>PU@g{RJvLw?HeoZiU@Nv^J9c0vc40U6U@!JzKMvp^
z4&gA4;3$saI8GoHCvgg=aRz5`4(D+J7jX%faRpa#4cBo4H*pKMaR+yC5BKo^5Ag_(
z@dQut4A1cbX?TfOc#SuBi+6aBbbP=^e8OjZ!B>34cl^Ll{K9Yi!C(9vZy#?n8A=8v
zqhhOMQZg%cioN2XI4Vv`7A33VthgxIl<Z0lC8v^0$*s65Zi>5-N6D+?Q}Qbwil<UQ
zF_eNzA*HZVL@BBiQ@j*!rMOZ;DXElFN-Jd)i{hjBDrJ>&N_oXksi0I;{FMMDP^qL;
xR;nmLO0ZH@siss{YA7|8T1suDj#5_%QR*r6l?F;frIFHDX<~Dbe`51I?LS7S48Q;Y

diff --git a/dist/index.js.map b/dist/index.js.map
index 02291496c21a3f2c950e9933af32d439ffca274e..f5a903037826e16504e4f13b93125f4596a8e130 100644
GIT binary patch
delta 1131
zcmYkzX;92@0LJl2huWkqDjnPYqe6EmSIVtaT1U=kx7w7BUHe~05-Q3qqF?S?ZV}ck
zw^AtAI>+#;885wVe7!MVd}f|`=6Tx6yB#_!x*ZyGiiMP{@T{##w-f4SWoWI&O(Ei9
zUH*lvCQWmzt<Y%Qohy}cwNkc057@#E_HaN?IKl}EIHMO_&>OB$!VT`|gTC;9C%n)P
z-td91MJf9^|ME6v6w7+E6t2%8{Z&+ulW&s3jl!6z3iA2Cks@<+W?f{qE<2C4$j?+I
z*mDRh72PT75MinEQ;Xl3DlZ$8P-s;NHm2%CtqT5@M6KH3S{Lu{D3mR}?&5or6djyq
z)SGnXd_%D$m&j&)QJ551YBU+L^|BmcEYz8E4W^>9FcD>~_YfVal1e1U#5h^n4eFLW
z@gqp>Ba{J>qPokfhJ*n0#{dK(2*DVLK^Tk>gdz;#h(IKw5RD-iieZRBEQVtQMq(63
zBMxH_j|7axIE=>xOvEHi#uOwX2~&}b6r^Gr(xAa~%)m^{LONz+4(4JW=3@aeun>!o
z2`zNULN;=sM=lm45BXSv0u-VM#W28#r7%H;8OyL7E3gtJScOuoMj6&%E!LqN6{y5|
zY(N#Nu@RfF8C$Rw+prxwP=lS=g<9;!9@Igg9(%D5`*8pVaR`TT1V?cU$8iEDaS9DM
zjWallb2yI+xQI(=#ARGT6RzSKuET;GxQSc1jXSuDd$^BgJitRd!eczaQ#`|Sw4fC)
l(1v!r#4Ef;2RiWvZ}ATA@c~wR#3y{l7kssJS-<^k_ygzkj_CjZ

delta 1100
zcmXxZXIRVu0LSqsmsCnaLf!Zy6?N{c$S9c^k-g&X-2J(v|DF4vjEn}(PQu?xc6JfY
zmXVQ&%&a%wdf}CqJ-&G!FFw!n8%;$mehq~!e$_UqEHf-nsnGZ){tL!Gs)YZcq$abr
zT-Dl&wX#Pm`=AX}@I_nrp&k4YfIzfI5Q5PGAqYhn!qE{C=!8ggMi+EN6r#OaSsnB%
zK$1nbpck_wCE27gs-@f<TeeHkI|YNy;<gy97OS1p>J;=ACDp8nRjN#yaFrC3ucQ^I
zBbAIgZG`gMq)AfZ&6*UC-K>GuYd7np5T&tH9juf)b^hK$r>@>^5DW$(&KM`yMVBbJ
zM5jxXMaeA-Zo4Sh9M&As)w()_Jkcd*J0!&?Ru`p&rbh>Q9L+ii=!Wj-ff)2eEaDK4
zUg(VkBtnlqFu;hu=!gCofPqNDAPhz_hF~a$VK`EdiV;Y|NQ}a0jKNrpLpsJ|0w!V-
zGB6oakcp|7hUu7rnV5yyn1i{Phxy3D0xX0HW>~NYR@fk7F_yrNY%E0%mLV4s9B^Ve
zT#(_$3glrWR$(>PARlY74(qW21t>%jim?%!uo)g~!B%X;cI?1T>_Q24qZE5khP~K_
z{ZMcK2XP38aRlW!iV7UVah$+OoWg0GK_$-O9M0ncF5(g{qYBlyf~%;(HC)FHcySZA
za2t1U7x!=<4^WGTc!bAzf;v3KGd#x&)Z--@@CvWdh&OnPCcMLYe85M1!e=z&3%=qT
MzIz?bKYmvJ1<*w(<p2Nx

diff --git a/dist/platforms/ubuntu/steps/activate.sh b/dist/platforms/ubuntu/steps/activate.sh
index efe95b83..9e051249 100755
--- a/dist/platforms/ubuntu/steps/activate.sh
+++ b/dist/platforms/ubuntu/steps/activate.sh
@@ -75,11 +75,12 @@ else
   #
   echo "License activation strategy could not be determined."
   echo ""
-  echo "Visit https://game.ci/docs/github/getting-started for more"
+  echo "Visit https://game.ci/docs/github/activation for more"
   echo "details on how to set up one of the possible activation strategies."
 
   echo "::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. Otherwise please use UNITY_LICENSING_SERVER."
+or UNITY_LICENSE. Otherwise please use UNITY_LICENSING_SERVER. See more info at https://game.ci/docs/github/activation"
+
   # Immediately exit as no UNITY_EXIT_CODE can be derived.
   exit 1;
 
@@ -98,6 +99,3 @@ else
   echo "::error ::There was an error while trying to activate the Unity license."
   exit $UNITY_EXIT_CODE
 fi
-
-# Return to previous working directory
-popd
diff --git a/dist/platforms/ubuntu/steps/return_license.sh b/dist/platforms/ubuntu/steps/return_license.sh
index 2984f701..3555e1de 100755
--- a/dist/platforms/ubuntu/steps/return_license.sh
+++ b/dist/platforms/ubuntu/steps/return_license.sh
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 
-# Run in ACTIVATE_LICENSE_PATH directory
-echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
-pushd "$ACTIVATE_LICENSE_PATH"
-
-
-if [[ -n "$UNITY_LICENSING_SERVER" ]]; then  #
+if [[ -n "$UNITY_LICENSING_SERVER" ]]; then
   #
   # Return any floating license used.
   #
@@ -25,6 +20,3 @@ elif [[ -n "$UNITY_SERIAL" ]]; then
     -password "$UNITY_PASSWORD" \
     -projectPath "/BlankProject"
 fi
-
-# Return to previous working directory
-popd
diff --git a/dist/platforms/windows/activate.ps1 b/dist/platforms/windows/activate.ps1
index 897ec17e..1f630983 100644
--- 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;
+}
diff --git a/dist/platforms/windows/build.ps1 b/dist/platforms/windows/build.ps1
index 751cf9d2..5622fae6 100644
--- a/dist/platforms/windows/build.ps1
+++ b/dist/platforms/windows/build.ps1
@@ -156,10 +156,10 @@ $unityArgs = @(
 # Remove null items as that will fail the Start-Process call
 $unityArgs = $unityArgs | Where-Object { $_ -ne $null }
 
-$unityProcess = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Unity.exe" `
-                         -ArgumentList $unityArgs `
-                         -PassThru `
-                         -NoNewWindow
+$unityProcess = Start-Process -FilePath "$Env:UNITY_PATH/Editor/Unity.exe" `
+                              -ArgumentList $unityArgs `
+                              -PassThru `
+                              -NoNewWindow
 
 # Cache the handle so exit code works properly
 # https://stackoverflow.com/questions/10262231/obtaining-exitcode-using-start-process-and-waitforexit-instead-of-wait
diff --git a/dist/platforms/windows/return_license.ps1 b/dist/platforms/windows/return_license.ps1
index 709c3895..edf7ec2e 100644
--- a/dist/platforms/windows/return_license.ps1
+++ b/dist/platforms/windows/return_license.ps1
@@ -6,9 +6,47 @@ Write-Output "#      Return License     #"
 Write-Output "###########################"
 Write-Output ""
 
-& "$Env:UNITY_PATH\Editor\Unity.exe" -batchmode -quit -nographics `
-                                     -username $Env:UNITY_EMAIL `
-                                     -password $Env:UNITY_PASSWORD `
-                                     -returnlicense `
-                                     -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 return the license that is currently in use.
+  #
+  $RETURN_LICENSE_OUTPUT = Start-Process -FilePath "$Env:UNITY_PATH/Editor/Unity.exe" `
+                                         -NoNewWindow `
+                                         -PassThru `
+                                         -ArgumentList "-batchmode `
+                                                         -quit `
+                                                         -nographics `
+                                                         -username $Env:UNITY_EMAIL `
+                                                         -password $Env:UNITY_PASSWORD `
+                                                         -returnlicense `
+                                                         -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 = $RETURN_LICENSE_OUTPUT.Handle
+
+  while ($true) {
+      if ($RETURN_LICENSE_OUTPUT.HasExited) {
+        $RETURN_LICENSE_EXIT_CODE = $RETURN_LICENSE_OUTPUT.ExitCode
+
+        # Display results
+        if ($RETURN_LICENSE_EXIT_CODE -eq 0)
+        {
+            Write-Output "License Return Succeeded"
+        } else
+        {
+            Write-Output "License Return failed, with exit code $RETURN_LICENSE_EXIT_CODE"
+            Write-Output "::warning ::License Return failed! If this is a Pro License you might need to manually `
+free the seat in your Unity admin panel or you might run out of seats to activate with."
+        }
+
+        break
+      }
+
+      Start-Sleep -Seconds 3
+  }
+}
diff --git a/dist/platforms/windows/set_gitcredential.ps1 b/dist/platforms/windows/set_gitcredential.ps1
index afb947c6..f77f31b8 100644
--- a/dist/platforms/windows/set_gitcredential.ps1
+++ b/dist/platforms/windows/set_gitcredential.ps1
@@ -1,4 +1,4 @@
-if ([string]::IsNullOrEmpty($env:GIT_PRIVATE_TOKEN)) {
+if ($null -eq ${env:GIT_PRIVATE_TOKEN}) {
     Write-Host "GIT_PRIVATE_TOKEN unset skipping"
 }
 else {
@@ -8,7 +8,7 @@ else {
     git config --global --replace-all "url.https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/"
     git config --global --add "url.https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "git@github.com"
     git config --global --add "url.https://token:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "https://github.com/"
-    
+
     git config --global "url.https://ssh:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/"
     git config --global "url.https://git:$env:GIT_PRIVATE_TOKEN@github.com/".insteadOf "git@github.com:"
 }
diff --git a/src/model/docker.ts b/src/model/docker.ts
index 6d7b2843..1beb4923 100644
--- a/src/model/docker.ts
+++ b/src/model/docker.ts
@@ -21,6 +21,9 @@ class Docker {
         break;
       case 'win32':
         runCommand = this.getWindowsCommand(image, parameters);
+        break;
+      default:
+        throw new Error(`Operation system, ${process.platform}, is not supported yet.`);
     }
 
     options.silent = silent;
diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts
index cf484708..cf4de698 100644
--- a/src/model/image-tag.ts
+++ b/src/model/image-tag.ts
@@ -169,7 +169,7 @@ class ImageTag {
 
     if (customImage) return customImage;
 
-    return `${image}:${tag}`; // '0' here represents the docker repo version
+    return `${image}:${tag}`;
   }
 }