Additional Fixes and Improvements

action.yml

@@ -124,6 +124,14 @@ inputs:
       'Isolation mode to use for the docker container. Can be one of process, hyperv, or default. Default will pick the
       default mode as described by Microsoft where server versions use process and desktop versions use hyperv. Only
       applicable on Windows'
+  containerRegistryRepository:
+    required: false
+    default: 'unityci/editor'
+    description: 'Container registry and repository to pull image from. Only applicable if customImage is not set.'
+  containerRegistryImageVersion:
+    required: false
+    default: '3'
+    description: 'Container registry image version. Only applicable if customImage is not set.'
   allowDirtyBuild:
     required: false
     default: ''

dist/platforms/mac/entrypoint.sh

@@ -4,8 +4,13 @@
 # Create directories for license activation
 #
 
-sudo mkdir /Library/Application\ Support/Unity
-sudo chmod -R 777 /Library/Application\ Support/Unity
+UNITY_LICENSE_PATH="/Library/Application Support/Unity"
+
+if [ ! -d "$UNITY_LICENSE_PATH" ]; then
+  echo "Creating Unity License Directory"
+  sudo mkdir -p "$UNITY_LICENSE_PATH"
+  sudo chmod -R 777 "$UNITY_LICENSE_PATH"
+fi;
 
 ACTIVATE_LICENSE_PATH="$ACTION_FOLDER/BlankProject"
 mkdir -p "$ACTIVATE_LICENSE_PATH"
@@ -21,7 +26,6 @@ source $ACTION_FOLDER/platforms/mac/steps/return_license.sh
 # Remove license activation directory
 #
 
-sudo rm -r /Library/Application\ Support/Unity
 rm -r "$ACTIVATE_LICENSE_PATH"
 
 #

dist/platforms/windows/build.ps1

@@ -156,26 +156,29 @@ $unityArgs = @(
 # Remove null items as that will fail the Start-Process call
 $unityArgs = $unityArgs | Where-Object { $_ -ne $null }
 
-$process = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Unity.exe" `
+$unityProcess = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Unity.exe" `
                          -ArgumentList $unityArgs `
                          -PassThru `
                          -NoNewWindow
 
-while (!$process.HasExited) {
-    if ($process.HasExited) {
-      Start-Sleep -Seconds 5
-      Get-Process
+# Cache the handle so exit code works properly
+# https://stackoverflow.com/questions/10262231/obtaining-exitcode-using-start-process-and-waitforexit-instead-of-wait
+$unityHandle = $unityProcess.Handle
 
-      Start-Sleep -Seconds 10
+while ($true) {
+    if ($unityProcess.HasExited) {
+      Start-Sleep -Seconds 3
       Get-Process
 
+      $BUILD_EXIT_CODE = $unityProcess.ExitCode
+
       # Display results
-      if ($process.ExitCode -eq 0)
+      if ($BUILD_EXIT_CODE -eq 0)
       {
           Write-Output "Build Succeeded!!"
       } else
       {
-          Write-Output "$('Build failed, with exit code ')$($process.ExitCode)$('"')"
+          Write-Output "Build failed, with exit code $BUILD_EXIT_CODE"
       }
 
       Write-Output ""
@@ -187,8 +190,8 @@ while (!$process.HasExited) {
       Get-ChildItem $Env:BUILD_PATH_FULL
       Write-Output ""
 
-      exit $process.ExitCode
+      break
     }
 
-    Start-Sleep -Seconds 5
+    Start-Sleep -Seconds 3
 }

dist/platforms/windows/entrypoint.ps1

@@ -12,16 +12,18 @@ regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio.
 Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force }
 
 # Setup Git Credentials
-& "c:\steps\set_gitcredential.ps1"
+. "c:\steps\set_gitcredential.ps1"
 
 # Activate Unity
-& "c:\steps\activate.ps1"
+. "c:\steps\activate.ps1"
 
 # Build the project
-& "c:\steps\build.ps1"
+. "c:\steps\build.ps1"
 
 # Free the seat for the activated license
-& "c:\steps\return_license.ps1"
+. "c:\steps\return_license.ps1"
 
 Start-Sleep -Seconds 3
 Get-Process
+
+exit $BUILD_EXIT_CODE

src/model/build-parameters.ts

@@ -44,6 +44,8 @@ class BuildParameters {
   public dockerCpuLimit!: string;
   public dockerMemoryLimit!: string;
   public dockerIsolationMode!: string;
+  public containerRegistryRepository!: string;
+  public containerRegistryImageVersion!: string;
 
   public customParameters!: string;
   public sshAgent!: string;
@@ -170,6 +172,8 @@ class BuildParameters {
       dockerCpuLimit: Input.dockerCpuLimit,
       dockerMemoryLimit: Input.dockerMemoryLimit,
       dockerIsolationMode: Input.dockerIsolationMode,
+      containerRegistryRepository: Input.containerRegistryRepository,
+      containerRegistryImageVersion: Input.containerRegistryImageVersion,
       providerStrategy: CloudRunnerOptions.providerStrategy,
       buildPlatform: CloudRunnerOptions.buildPlatform,
       kubeConfig: CloudRunnerOptions.kubeConfig,

src/model/docker.ts

@@ -15,7 +15,7 @@ class Docker {
     // eslint-disable-next-line unicorn/no-useless-undefined
     options: ExecOptions | undefined = undefined,
     entrypointBash: boolean = false,
-    errorWhenMissingUnityBuildResults: boolean = true,
+    errorWhenMissingUnityBuildResults: boolean = false,
   ) {
     let runCommand = '';
     switch (process.platform) {

src/model/exec-with-error-check.ts

@@ -1,10 +1,10 @@
-import { getExecOutput, ExecOptions } from '@actions/exec';
+import { ExecOptions, getExecOutput } from '@actions/exec';
 
 export async function execWithErrorCheck(
   commandLine: string,
   arguments_?: string[],
   options?: ExecOptions,
-  errorWhenMissingUnityBuildResults: boolean = true,
+  errorWhenMissingUnityBuildResults: boolean = false,
 ): Promise<number> {
   const result = await getExecOutput(commandLine, arguments_, options);
 

src/model/image-tag.test.ts

@@ -5,11 +5,11 @@ describe('ImageTag', () => {
     editorVersion: '2099.9.f9f9',
     targetPlatform: 'Test',
     builderPlatform: '',
+    containerRegistryRepository: 'unityci/editor',
+    containerRegistryImageVersion: '3',
   };
 
   const defaults = {
-    repository: 'unityci',
-    name: 'editor',
     image: 'unityci/editor',
   };
 
@@ -21,8 +21,7 @@ describe('ImageTag', () => {
     it('accepts parameters and sets the right properties', () => {
       const image = new ImageTag(testImageParameters);
 
-      expect(image.repository).toStrictEqual('unityci');
-      expect(image.name).toStrictEqual('editor');
+      expect(image.repository).toStrictEqual('unityci/editor');
       expect(image.editorVersion).toStrictEqual(testImageParameters.editorVersion);
       expect(image.targetPlatform).toStrictEqual(testImageParameters.targetPlatform);
       expect(image.builderPlatform).toStrictEqual(testImageParameters.builderPlatform);
@@ -53,6 +52,8 @@ describe('ImageTag', () => {
       const image = new ImageTag({
         editorVersion: '2099.1.1111',
         targetPlatform: testImageParameters.targetPlatform,
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
       switch (process.platform) {
         case 'win32':
@@ -68,6 +69,8 @@ describe('ImageTag', () => {
         editorVersion: '2099.1.1111',
         targetPlatform: testImageParameters.targetPlatform,
         customImage: `${defaults.image}:2099.1.1111@347598437689743986`,
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
 
       expect(image.toString()).toStrictEqual(image.customImage);
@@ -77,6 +80,8 @@ describe('ImageTag', () => {
       const image = new ImageTag({
         editorVersion: '2019.2.11f1',
         targetPlatform: 'WebGL',
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
 
       switch (process.platform) {
@@ -93,6 +98,8 @@ describe('ImageTag', () => {
       const image = new ImageTag({
         editorVersion: '2019.2.11f1',
         targetPlatform: 'NoTarget',
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
 
       switch (process.platform) {