[email protected] (#51)

- update [email protected]
- updated build-options test matrix

Author: StephenHodgson

.github/workflows/build-options.json

@@ -8,17 +8,18 @@
     "None",
     "4.7.2",
     "5.6.7f1 (e80cc3114ac1)",
-    "2020.3",
+    "2019.4",
+    "2020",
     "2021.3.x",
     "2022.x",
     "6000.0.x",
-    "6000.1.x",
-    "6000"
+    "6000.1.*",
+    "6000.2"
   ],
   "include": [
     {
       "os": "ubuntu-latest",
-      "build-targets": "StandaloneLinux64, Android, iOS",
+      "build-targets": "StandaloneLinux64, Android, iOS, WebGL",
       "modules": "linux-server"
     },
     {
@@ -69,7 +70,7 @@
     {
       "os": "ubuntu-latest",
       "unity-version": "None",
-      "build-targets": "StandaloneLinux64, Android, iOS",
+      "build-targets": "StandaloneLinux64, Android, iOS, WebGL",
       "modules": "linux-server"
     },
     {

.github/workflows/build.yml

@@ -60,17 +60,17 @@ jobs:
           if [[ "$MATRIX_UNITY_VERSION_PREFIX" =~ ^([0-9]+\.[0-9]+\.[0-9]+[abcfpx]?[0-9]*) ]]; then
             MATRIX_UNITY_VERSION_PREFIX="${BASH_REMATCH[1]}"
           fi
-          # Support matrix.unity-version patterns ending with .x after major.minor (e.g., 2021.3.x)
-          if [[ "${{ matrix.unity-version }}" =~ ^([0-9]+\.[0-9]+)\.x$ ]]; then
+          # Support matrix.unity-version patterns ending with .x or .* after major.minor (e.g., 2021.3.x or 2021.3.*)
+          if [[ "${{ matrix.unity-version }}" =~ ^([0-9]+\.[0-9]+)\.[x\*]$ ]]; then
             UNITY_MAJOR_MINOR="${BASH_REMATCH[1]}"
             if [[ "$UNITY_EDITOR_VERSION" == "$UNITY_MAJOR_MINOR"* ]]; then
               echo "Unity version matches matrix.unity-version: $UNITY_EDITOR_VERSION satisfies ${{ matrix.unity-version }}"
             else
               echo "Unity version mismatch: $UNITY_EDITOR_VERSION does not satisfy ${{ matrix.unity-version }}"
               exit 1
             fi
-          # Support matrix.unity-version patterns ending with .x after major (e.g., 2022.x)
-          elif [[ "${{ matrix.unity-version }}" =~ ^([0-9]+)\.x$ ]]; then
+          # Support matrix.unity-version patterns ending with .x or .* after major (e.g., 2022.x or 2022.*)
+          elif [[ "${{ matrix.unity-version }}" =~ ^([0-9]+)\.[x\*]$ ]]; then
             UNITY_MAJOR="${BASH_REMATCH[1]}"
             if [[ "$UNITY_EDITOR_VERSION" == "$UNITY_MAJOR"* ]]; then
               echo "Unity version matches matrix.unity-version: $UNITY_EDITOR_VERSION satisfies ${{ matrix.unity-version }}"

dist/index.js

@@ -3287,8 +3287,9 @@ async function getSdkManager(rootEditorPath) {
 }
 async function getAndroidSdkPath(rootEditorPath, androidTargetSdk) {
     logger.ci(`Attempting to locate Android SDK Path...\n  > editorPath: ${rootEditorPath}\n  > androidTargetSdk: ${androidTargetSdk}`);
-    const sdkPath = await (0, utilities_1.ResolveGlobToPath)([rootEditorPath, '**', 'PlaybackEngines', 'AndroidPlayer', 'SDK', 'platforms', `android-${androidTargetSdk}/`]);
+    let sdkPath;
     try {
+        sdkPath = await (0, utilities_1.ResolveGlobToPath)([rootEditorPath, '**', 'PlaybackEngines', 'AndroidPlayer', 'SDK', 'platforms', `android-${androidTargetSdk}/`]);
         await fs_1.default.promises.access(sdkPath, fs_1.default.constants.R_OK);
     }
     catch (error) {
@@ -4677,19 +4678,23 @@ class UnityHub {
         finally {
             this.logger.endGroup();
             const match = output.match(/Assertion (?<assert>.+) failed/g);
+            const retryConditions = [
+                'async hook stack has become corrupted',
+                'failed to download'
+            ];
             if (match ||
-                output.includes('async hook stack has become corrupted')) {
+                retryConditions.some(s => output.includes(s))) {
                 this.logger.warn(`Install failed, retrying...`);
                 return await this.Exec(args);
             }
-            if (exitCode > 0 || output.includes('Error:')) {
-                const error = output.match(/Error: (.+)/);
+            if (exitCode > 0 || output.includes('Error')) {
+                const error = output.match(/Error(?: given)?:\s*(.+)/);
                 const errorMessage = error && error[1] ? error[1] : 'Unknown Error';
                 switch (errorMessage) {
                     case 'No modules found to install.':
                         break;
                     default:
-                        throw new Error(`Failed to execute Unity Hub: [${exitCode}] ${errorMessage}`);
+                        throw new Error(`Failed to execute Unity Hub (exit code: ${exitCode}) ${errorMessage}`);
                 }
             }
             output = output.split('\n')
@@ -5318,12 +5323,12 @@ done
         return JSON.parse(modulesContent);
     }
     async installUnity(unityVersion, modules) {
-        this.logger.ci(`Installing Unity ${unityVersion.toString()}...`);
         if (unityVersion.isLegacy()) {
             return await this.installUnity4x(unityVersion);
         }
         if (process.platform === 'linux') {
             const arch = process.arch === 'x64' ? 'amd64' : process.arch === 'arm64' ? 'arm64' : process.arch;
+            // install older versions of libssl for older Unity versions
             if (['2019.1', '2019.2'].some(v => unityVersion.version.startsWith(v))) {
                 const url = `https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.0.0_1.0.2g-1ubuntu4.20_${arch}.deb`;
                 const downloadPath = path.join((0, utilities_1.GetTempDir)(), `libssl1.0.0_1.0.2g-1ubuntu4.20_${arch}.deb`);
@@ -5349,6 +5354,7 @@ done
                 }
             }
         }
+        this.logger.ci(`Installing Unity ${unityVersion.toString()}...`);
         const args = ['install', '--version', unityVersion.version];
         if (unityVersion.changeset) {
             args.push('--changeset', unityVersion.changeset);
@@ -5364,11 +5370,13 @@ done
             args.push('--cm');
         }
         const output = await this.Exec(args, { showCommand: true, silent: false });
-        if (output.includes(`Error while installing an editor or a module from changeset`)) {
+        if (output.includes(`Error while installing an editor or a module from changeset`) ||
+            output.includes(`failed to download.`)) {
             throw new Error(`Failed to install Unity ${unityVersion.toString()}`);
         }
     }
     async installUnity4x(unityVersion) {
+        this.logger.ci(`Installing Unity ${unityVersion.toString()}...`);
         const hubInstallDir = await this.GetInstallPath();
         switch (process.platform) {
             case 'win32': {

dist/index.js.map

@@ -1,6 +1,6 @@
 {
   "name": "unity-setup",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A GitHub action for setting up the Unity Game Engine for CI/CD workflows.",
   "author": "RageAgainstThePixel",
   "license": "MIT",
@@ -27,12 +27,12 @@
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
     "@actions/glob": "^0.5.0",
-    "@rage-against-the-pixel/unity-cli": "^1.3.0",
+    "@rage-against-the-pixel/unity-cli": "^1.3.1",
     "semver": "^7.7.3",
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/node": "^22.18.8",
+    "@types/node": "^22.18.10",
     "@types/semver": "^7.7.1",
     "@vercel/ncc": "^0.34.0",
     "shx": "^0.4.0",