Fix pro activation (#602)

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

Author: AndrewKahr

action.yml

@@ -261,6 +261,11 @@ outputs:
     description: 'The generated version used for the Unity build'
   androidVersionCode:
     description: 'The generated versionCode used for the Android Unity build'
+  engineExitCode:
+    description:
+      'Returns the exit code from the build scripts. This code is 0 if the build was successful. If there was an error
+      during activation, the code is from the activation step. If activation is successful, the code is from the project
+      build step.'
 branding:
   icon: 'box'
   color: 'gray-dark'

dist/default-build-script/Assembly-CSharp-Editor.csproj

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
-# Ensure machine ID is randomized
-dbus-uuidgen > /etc/machine-id && mkdir -p /var/lib/dbus/ && ln -sf /etc/machine-id /var/lib/dbus/machine-id
+# Ensure machine ID is randomized for personal license activation
+if [[ "$UNITY_SERIAL" = F* ]]; then
+  echo "Randomizing machine ID for personal license activation"
+  dbus-uuidgen > /etc/machine-id && mkdir -p /var/lib/dbus/ && ln -sf /etc/machine-id /var/lib/dbus/machine-id
+fi
 
 #
 # Prepare Android SDK, if needed

dist/default-build-script/ProjectSettings/XRSettings.asset

@@ -35,12 +35,13 @@ if [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
       echo "Activation successful"
       break
     else
-      echo "Activation failed, retrying in $delay seconds..."
-      sleep $delay
-
       # Increment retry count
       ((retry_count++))
 
+      echo "::warning ::Activation failed, attempting retry #$retry_count"
+      echo "Activation failed, retrying in $delay seconds..."
+      sleep $delay
+
       # Double the delay for the next iteration
       delay=$((delay * 2))
     fi

dist/default-build-script/default-build-script.sln

@@ -19,25 +19,31 @@ 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());
     }
 
     // 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);
   }