Unity builder v4 Parity Update (#246)

- Updated activation strategy to align with builder strategy for more stable activation with retry logic
- Added `containerRegistryImageVersion` and `containerRegistryRepository` for improved custom image support
- Added `runAsHostUser` to fix self-hosted runner issues
- Scripts folder cleanup
- Added error/warning annotations for activation issues
- Improved serial masking
- Image environment factory addition and docker refactoring

src/model/docker.ts

@@ -1,3 +1,4 @@
+import ImageEnvironmentFactory from './image-environment-factory';
 import { existsSync, mkdirSync, readFileSync, rmSync } from 'fs';
 import LicensingServerSetup from './licensing-server-setup';
 import type { RunnerContext } from './action';
@@ -53,25 +54,15 @@ const Docker = {
   getLinuxCommand(image, parameters): string {
     const {
       actionFolder,
-      editorVersion,
       workspace,
-      projectPath,
-      customParameters,
       testMode,
-      coverageOptions,
-      artifactsPath,
       useHostNetwork,
       sshAgent,
       sshPublicKeysDirectoryPath,
-      packageMode,
-      packageName,
-      gitPrivateToken,
       githubToken,
       runnerTemporaryPath,
-      chownFilesTo,
       dockerCpuLimit,
       dockerMemoryLimit,
-      unityLicensingServer,
     } = parameters;
 
     const githubHome = path.join(runnerTemporaryPath, '_github_home');
@@ -84,91 +75,52 @@ const Docker = {
     ).join(';');
 
     return `docker run \
-                --workdir /github/workspace \
-                --cidfile "${cidfile}" \
-                --rm \
-                --env UNITY_LICENSE \
-                --env UNITY_LICENSE_FILE \
-                --env UNITY_EMAIL \
-                --env UNITY_PASSWORD \
-                --env UNITY_SERIAL \
-                --env UNITY_LICENSING_SERVER="${unityLicensingServer}" \
-                --env UNITY_VERSION="${editorVersion}" \
-                --env PROJECT_PATH="${projectPath}" \
-                --env CUSTOM_PARAMETERS="${customParameters}" \
-                --env TEST_PLATFORMS="${testPlatforms}" \
-                --env COVERAGE_OPTIONS="${coverageOptions}" \
-                --env COVERAGE_RESULTS_PATH="CodeCoverage" \
-                --env ARTIFACTS_PATH="${artifactsPath}" \
-                --env PACKAGE_MODE="${packageMode}" \
-                --env PACKAGE_NAME="${packageName}" \
-                --env GITHUB_REF \
-                --env GITHUB_SHA \
-                --env GITHUB_REPOSITORY \
-                --env GITHUB_ACTOR \
-                --env GITHUB_WORKFLOW \
-                --env GITHUB_HEAD_REF \
-                --env GITHUB_BASE_REF \
-                --env GITHUB_EVENT_NAME \
-                --env GITHUB_WORKSPACE="/github/workspace" \
-                --env GITHUB_ACTION \
-                --env GITHUB_EVENT_PATH \
-                --env RUNNER_OS \
-                --env RUNNER_TOOL_CACHE \
-                --env RUNNER_TEMP \
-                --env RUNNER_WORKSPACE \
-                --env GIT_PRIVATE_TOKEN="${gitPrivateToken}" \
-                --env CHOWN_FILES_TO="${chownFilesTo}" \
-                --env GIT_CONFIG_EXTENSIONS \
-                ${sshAgent ? '--env SSH_AUTH_SOCK=/ssh-agent' : ''} \
-                --volume "${githubHome}:/root:z" \
-                --volume "${githubWorkflow}:/github/workflow:z" \
-                --volume "${workspace}:/github/workspace:z" \
-                --volume "${actionFolder}/test-standalone-scripts:/UnityStandaloneScripts:z" \
-                --volume "${actionFolder}/steps:/steps:z" \
-                --volume "${actionFolder}/entrypoint.sh:/entrypoint.sh:z" \
-                --volume "${actionFolder}/unity-config:/usr/share/unity3d/config/:z" \
-                --cpus=${dockerCpuLimit} \
-                --memory=${dockerMemoryLimit} \
-                ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
-                ${
-                  sshAgent && !sshPublicKeysDirectoryPath
-                    ? `--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro`
-                    : ''
-                } \
-                ${
-                  sshPublicKeysDirectoryPath
-                    ? `--volume ${sshPublicKeysDirectoryPath}:/root/.ssh:ro`
-                    : ''
-                } \
-                ${useHostNetwork ? '--net=host' : ''} \
-                ${githubToken ? '--env USE_EXIT_CODE=false' : '--env USE_EXIT_CODE=true'} \
-                ${image} \
-                /bin/bash -c /entrypoint.sh`;
+            --workdir /github/workspace \
+            --cidfile "${cidfile}" \
+            --rm \
+            ${ImageEnvironmentFactory.getEnvVarString(parameters)} \
+            --env GIT_CONFIG_EXTENSIONS \
+            --env TEST_PLATFORMS="${testPlatforms}" \
+            --env GITHUB_WORKSPACE="/github/workspace" \
+            ${sshAgent ? '--env SSH_AUTH_SOCK=/ssh-agent' : ''} \
+            --volume "${githubHome}:/root:z" \
+            --volume "${githubWorkflow}:/github/workflow:z" \
+            --volume "${workspace}:/github/workspace:z" \
+            --volume "${actionFolder}/test-standalone-scripts:/UnityStandaloneScripts:z" \
+            --volume "${actionFolder}/platforms/ubuntu:/steps:z" \
+            --volume "${actionFolder}/unity-config:/usr/share/unity3d/config/:z" \
+            --volume "${actionFolder}/BlankProject":"/BlankProject:z" \
+            --cpus=${dockerCpuLimit} \
+            --memory=${dockerMemoryLimit} \
+            ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
+            ${
+              sshAgent && !sshPublicKeysDirectoryPath
+                ? `--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro`
+                : ''
+            } \
+            ${
+              sshPublicKeysDirectoryPath
+                ? `--volume ${sshPublicKeysDirectoryPath}:/root/.ssh:ro`
+                : ''
+            } \
+            ${useHostNetwork ? '--net=host' : ''} \
+            ${githubToken ? '--env USE_EXIT_CODE=false' : '--env USE_EXIT_CODE=true'} \
+            ${image} \
+            /bin/bash -c "/steps/entrypoint.sh`;
   },
 
   getWindowsCommand(image, parameters): string {
     const {
       actionFolder,
-      editorVersion,
       workspace,
-      projectPath,
-      customParameters,
       testMode,
-      coverageOptions,
-      artifactsPath,
       useHostNetwork,
       sshAgent,
-      packageMode,
-      packageName,
-      gitPrivateToken,
       githubToken,
       runnerTemporaryPath,
-      chownFilesTo,
       dockerCpuLimit,
       dockerMemoryLimit,
       dockerIsolationMode,
-      unityLicensingServer,
     } = parameters;
 
     const githubHome = path.join(runnerTemporaryPath, '_github_home');
@@ -181,48 +133,19 @@ const Docker = {
     ).join(';');
 
     return `docker run \
-                --workdir /github/workspace \
+                --workdir c:/github/workspace \
                 --cidfile "${cidfile}" \
                 --rm \
-                --env UNITY_LICENSE \
-                --env UNITY_LICENSE_FILE \
-                --env UNITY_EMAIL \
-                --env UNITY_PASSWORD \
-                --env UNITY_SERIAL \
-                --env UNITY_LICENSING_SERVER="${unityLicensingServer}" \
-                --env UNITY_VERSION="${editorVersion}" \
-                --env PROJECT_PATH="${projectPath}" \
-                --env CUSTOM_PARAMETERS="${customParameters}" \
+                ${ImageEnvironmentFactory.getEnvVarString(parameters)} \
                 --env TEST_PLATFORMS="${testPlatforms}" \
-                --env COVERAGE_OPTIONS="${coverageOptions}" \
-                --env COVERAGE_RESULTS_PATH="CodeCoverage" \
-                --env ARTIFACTS_PATH="${artifactsPath}" \
-                --env PACKAGE_MODE="${packageMode}" \
-                --env PACKAGE_NAME="${packageName}" \
-                --env GITHUB_REF \
-                --env GITHUB_SHA \
-                --env GITHUB_REPOSITORY \
-                --env GITHUB_ACTOR \
-                --env GITHUB_WORKFLOW \
-                --env GITHUB_HEAD_REF \
-                --env GITHUB_BASE_REF \
-                --env GITHUB_EVENT_NAME \
-                --env GITHUB_WORKSPACE="/github/workspace" \
-                --env GITHUB_ACTION \
-                --env GITHUB_EVENT_PATH \
-                --env RUNNER_OS \
-                --env RUNNER_TOOL_CACHE \
-                --env RUNNER_TEMP \
-                --env RUNNER_WORKSPACE \
-                --env GIT_PRIVATE_TOKEN="${gitPrivateToken}" \
-                --env CHOWN_FILES_TO="${chownFilesTo}" \
+                --env GITHUB_WORKSPACE="c:/github/workspace" \
                 ${sshAgent ? '--env SSH_AUTH_SOCK=c:/ssh-agent' : ''} \
                 --volume "${actionFolder}/test-standalone-scripts":"c:/UnityStandaloneScripts" \
                 --volume "${githubHome}":"c:/root" \
                 --volume "${githubWorkflow}":"c:/github/workflow" \
                 --volume "${workspace}":"c:/github/workspace" \
-                --volume "${actionFolder}/steps":"c:/steps" \
-                --volume "${actionFolder}":"c:/dist" \
+                --volume "${actionFolder}/platforms/windows":"c:/steps" \
+                --volume "${actionFolder}/BlankProject":"c:/BlankProject" \
                 ${sshAgent ? `--volume ${sshAgent}:c:/ssh-agent` : ''} \
                 ${
                   sshAgent
@@ -235,7 +158,7 @@ const Docker = {
                 ${useHostNetwork ? '--net=host' : ''} \
                 ${githubToken ? '--env USE_EXIT_CODE=false' : '--env USE_EXIT_CODE=true'} \
                 ${image} \
-                powershell c:/dist/entrypoint.ps1`;
+                powershell c:/steps/entrypoint.ps1`;
   },
 };