fix(ci.yml): check for null setup instance

thestonefox · web-flow · commit b7af1d87dabb · 2021-02-03T23:39:26.000Z
If `$setupInstance` is not found then we must force install
the base version of Unity.
diff --git a/templates/steps/ci.yml b/templates/steps/ci.yml
@@ -21,15 +21,15 @@ steps:
         If (!$setupInstance)
         {
           Write-Host "No Unity version specified and no Unity installation found - forcing to min supported version of 2018.3.10f1"
-          $version = "2018.3.10f1";
+          $version = "2018.3.10f1"
         }
         Else
         {
           Write-Host "Using already installed Unity version '$($setupInstance.Version)'."
         }
       }
 
-      If ($setupInstance.Version.ToString() -ne $version)
+      If (!$setupInstance -or $setupInstance.Version.ToString() -ne $version)
       {
         Write-Host "Installing Unity version '$version'."
         Install-UnitySetupInstance -Installers (Find-UnitySetupInstaller -Version $version -Components "Windows")

Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ steps:`
`21`	`21`	`If (!$setupInstance)`
`22`	`22`	`{`
`23`	`23`	`Write-Host "No Unity version specified and no Unity installation found - forcing to min supported version of 2018.3.10f1"`
`24`		`- $version = "2018.3.10f1";`
	`24`	`+ $version = "2018.3.10f1"`
`25`	`25`	`}`
`26`	`26`	`Else`
`27`	`27`	`{`
`28`	`28`	`Write-Host "Using already installed Unity version '$($setupInstance.Version)'."`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- If ($setupInstance.Version.ToString() -ne $version)`
	`32`	`+ If (!$setupInstance -or $setupInstance.Version.ToString() -ne $version)`
`33`	`33`	`{`
`34`	`34`	`Write-Host "Installing Unity version '$version'."`
`35`	`35`	`Install-UnitySetupInstance -Installers (Find-UnitySetupInstaller -Version $version -Components "Windows")`