Fix pro activation (#602)

- Only randomize uuid for personal licenses
- Add warning annotation for license activation retries
- add `engineExitCode` output
- repo/code cleanup

src/index.ts

@@ -19,18 +19,19 @@ async function runMain() {
     const buildParameters = await BuildParameters.create();
     const baseImage = new ImageTag(buildParameters);
 
+    let exitCode = -1;
+
     if (buildParameters.providerStrategy === 'local') {
       core.info('Building locally');
       await PlatformSetup.setup(buildParameters, actionFolder);
-      if (process.platform === 'darwin') {
-        MacBuilder.run(actionFolder);
-      } else {
-        await Docker.run(baseImage.toString(), {
-          workspace,
-          actionFolder,
-          ...buildParameters,
-        });
-      }
+      exitCode =
+        process.platform === 'darwin'
+          ? await MacBuilder.run(actionFolder)
+          : await Docker.run(baseImage.toString(), {
+              workspace,
+              actionFolder,
+              ...buildParameters,
+            });
     } else {
       await CloudRunner.run(buildParameters, baseImage.toString());
     }
@@ -38,6 +39,11 @@ async function runMain() {
     // Set output
     await Output.setBuildVersion(buildParameters.buildVersion);
     await Output.setAndroidVersionCode(buildParameters.androidVersionCode);
+    await Output.setEngineExitCode(exitCode);
+
+    if (exitCode !== 0) {
+      core.setFailed(`Build failed with exit code ${exitCode}`);
+    }
   } catch (error) {
     core.setFailed((error as Error).message);
   }

src/model/cloud-runner/providers/docker/index.ts

@@ -133,7 +133,7 @@ cp -a ${sharedFolder}. /github/workspace/cloud-runner-cache/
     if (fs.existsSync(`${workspace}/cloud-runner-cache`)) {
       await CloudRunnerSystem.Run(`ls ${workspace}/cloud-runner-cache && du -sh ${workspace}/cloud-runner-cache`);
     }
-    await Docker.run(
+    const exitCode = await Docker.run(
       image,
       { workspace, actionFolder, ...this.buildParameters },
       false,
@@ -150,9 +150,14 @@ cp -a ${sharedFolder}. /github/workspace/cloud-runner-cache/
         },
       },
       true,
-      false,
     );
 
+    // Docker doesn't exit on fail now so adding this to ensure behavior is unchanged
+    // TODO: Is there a helpful way to consume the exit code or is it best to except
+    if (exitCode !== 0) {
+      throw new Error(`Build failed with exit code ${exitCode}`);
+    }
+
     return myOutput;
   }
 }

src/model/docker.ts

@@ -1,8 +1,7 @@
-import { execWithErrorCheck } from './exec-with-error-check';
 import ImageEnvironmentFactory from './image-environment-factory';
 import { existsSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
-import { ExecOptions } from '@actions/exec';
+import { ExecOptions, exec } from '@actions/exec';
 import { DockerParameters, StringKeyValuePair } from './shared-types';
 
 class Docker {
@@ -12,11 +11,9 @@ class Docker {
     silent: boolean = false,
     overrideCommands: string = '',
     additionalVariables: StringKeyValuePair[] = [],
-    // eslint-disable-next-line unicorn/no-useless-undefined
-    options: ExecOptions | undefined = undefined,
+    options: ExecOptions = {},
     entrypointBash: boolean = false,
-    errorWhenMissingUnityBuildResults: boolean = false,
-  ) {
+  ): Promise<number> {
     let runCommand = '';
     switch (process.platform) {
       case 'linux':
@@ -25,12 +22,11 @@ class Docker {
       case 'win32':
         runCommand = this.getWindowsCommand(image, parameters);
     }
-    if (options) {
-      options.silent = silent;
-      await execWithErrorCheck(runCommand, undefined, options, errorWhenMissingUnityBuildResults);
-    } else {
-      await execWithErrorCheck(runCommand, undefined, { silent }, errorWhenMissingUnityBuildResults);
-    }
+
+    options.silent = silent;
+    options.ignoreReturnCode = true;
+
+    return await exec(runCommand, undefined, options);
   }
 
   static getLinuxCommand(

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

@@ -1,29 +0,0 @@
-import { ExecOptions, getExecOutput } from '@actions/exec';
-
-export async function execWithErrorCheck(
-  commandLine: string,
-  arguments_?: string[],
-  options?: ExecOptions,
-  errorWhenMissingUnityBuildResults: boolean = false,
-): Promise<number> {
-  const result = await getExecOutput(commandLine, arguments_, options);
-
-  if (!errorWhenMissingUnityBuildResults) {
-    return result.exitCode;
-  }
-
-  // Check for errors in the Build Results section
-  const match = result.stdout.match(/^#\s*Build results\s*#(.*)^Size:/ms);
-
-  if (match) {
-    const buildResults = match[1];
-    const errorMatch = buildResults.match(/^Errors:\s*(\d+)$/m);
-    if (errorMatch && Number.parseInt(errorMatch[1], 10) !== 0) {
-      throw new Error(`There was an error building the project. Please read the logs for details.`);
-    }
-  } else {
-    throw new Error(`There was an error building the project. Please read the logs for details.`);
-  }
-
-  return result.exitCode;
-}

src/model/mac-builder.ts

@@ -1,9 +1,10 @@
-import { execWithErrorCheck } from './exec-with-error-check';
+import { exec } from '@actions/exec';
 
 class MacBuilder {
-  public static async run(actionFolder: string, silent: boolean = false) {
-    await execWithErrorCheck('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], {
+  public static async run(actionFolder: string, silent: boolean = false): Promise<number> {
+    return await exec('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], {
       silent,
+      ignoreReturnCode: true,
     });
   }
 }

src/model/output.ts

@@ -8,6 +8,10 @@ class Output {
   static async setAndroidVersionCode(androidVersionCode: string) {
     core.setOutput('androidVersionCode', androidVersionCode);
   }
+
+  static async setEngineExitCode(exitCode: number) {
+    core.setOutput('engineExitCode', exitCode);
+  }
 }
 
 export default Output;