[email protected] (#32)

- add support for installing unity 5.x versions
- add `install-path` input parameter

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: js6pak <[email protected]>

Author: 3 people

.github/workflows/validate.yml

@@ -27,6 +27,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         unity-versions:
           - 'in version file'
+          - '5.6.7f1 (e80cc3114ac1)'
           - 2019.4.40f1
           - 2020.3
           - 2021.3.x
@@ -42,6 +43,10 @@ jobs:
           - os: macos-latest
             build-targets: StandaloneOSX Android iOS VisionOS
             modules: mac-server
+        exclude:
+          # Exclude Unity 5.x for linux as it is not supported
+          - os: ubuntu-latest
+            unity-versions: '5.6.7f1 (e80cc3114ac1)'
     steps:
       - uses: actions/checkout@v4
 

README.md

@@ -54,6 +54,7 @@ steps:
 | `build-targets` | Specify the build targets to install for. Remaps to corresponding module. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL` `VisionOS`. | false |
 | `modules` | Modules to install with the editor. This list can be different per editor version. | false |
 | `architecture` | Specify the architecture to install. Either `x86_64` or `arm64`. | false |
+| `install-path` | Specify the path where Unity will be installed to. | false |
 
 ### outputs
 

action.yml

@@ -24,6 +24,9 @@ inputs:
     description: 'Specify the architecture to install. Either `x86_64` or `arm64`.'
     required: false
     default: ''
+  install-path:
+    description: 'Specify the path where Unity will be installed to.'
+    required: false
 runs:
   using: 'node20'
   main: 'dist/index.js'

dist/index.js

@@ -5754,7 +5754,7 @@ function expand(str, isTop) {
   var isOptions = m.body.indexOf(',') >= 0;
   if (!isSequence && !isOptions) {
     // {a},b}
-    if (m.post.match(/,.*\}/)) {
+    if (m.post.match(/,(?!,).*\}/)) {
       str = m.pre + '{' + m.body + escClose + m.post;
       return expand(str);
     }
@@ -34181,7 +34181,20 @@ async function ValidateInputs() {
         const changesetStr = changeset ? ` (${changeset})` : '';
         core.info(`  > ${version}${changesetStr}`);
     }
-    return [versions, architecture, modules, unityProjectPath];
+    let installPath = core.getInput('install-path');
+    if (installPath) {
+        installPath = installPath.trim();
+        if (installPath.length === 0) {
+            installPath = undefined;
+        }
+        else {
+            core.info(`Install Path:\n  > "${installPath}"`);
+        }
+    }
+    if (!installPath) {
+        core.debug('No install path specified, using default Unity Hub install path.');
+    }
+    return [versions, architecture, modules, unityProjectPath, installPath];
 }
 function getArrayInput(key) {
     let input = core.getInput(key);
@@ -34464,6 +34477,7 @@ async function execSdkManager(sdkManagerPath, javaSdk, args) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Get = Get;
+exports.setInstallPath = setInstallPath;
 exports.Unity = Unity;
 exports.ListInstalledEditors = ListInstalledEditors;
 const utility_1 = __nccwpck_require__(5418);
@@ -34704,6 +34718,14 @@ async function execUnityHub(args) {
     }
     return output;
 }
+const retryErrorMessages = [
+    'Editor already installed in this location',
+    'failed to download. Error given: Request timeout'
+];
+async function setInstallPath(installPath) {
+    await fs.promises.mkdir(installPath, { recursive: true });
+    await execUnityHub(["install-path", "--set", installPath]);
+}
 async function Unity(version, changeset, architecture, modules) {
     if (os.arch() == 'arm64' && !isArmCompatible(version)) {
         core.warning(`Unity ${version} does not support arm64 architecture, falling back to x86_64`);
@@ -34724,8 +34746,8 @@ async function Unity(version, changeset, architecture, modules) {
             await installUnity(version, changeset, architecture, modules);
         }
         catch (error) {
-            if (error.message.includes('Editor already installed in this location')) {
-                removePath(editorPath);
+            if (retryErrorMessages.some(msg => error.message.includes(msg))) {
+                await removePath(editorPath);
                 await installUnity(version, changeset, architecture, modules);
             }
         }
@@ -34749,6 +34771,17 @@ async function Unity(version, changeset, architecture, modules) {
                 core.info(`  > ${module}`);
             }
         }
+        if (process.platform === 'linux') {
+            const dataPath = path.join(path.dirname(editorPath), 'Data');
+            const beeBackend = path.join(dataPath, 'bee_backend');
+            const dotBeeBackend = path.join(dataPath, '.bee_backend');
+            if (fs.existsSync(beeBackend) && !fs.existsSync(dotBeeBackend)) {
+                await fs.promises.rename(beeBackend, dotBeeBackend);
+                const wrapperSource = __nccwpck_require__.ab + "linux-bee-backend-wrapper.sh";
+                await fs.promises.copyFile(__nccwpck_require__.ab + "linux-bee-backend-wrapper.sh", beeBackend);
+                await fs.promises.chmod(beeBackend, 0o755);
+            }
+        }
     }
     catch (error) {
         if (error.message.includes(`No modules found`)) {
@@ -45558,12 +45591,15 @@ const unityHub = __nccwpck_require__(2754);
 const core = __nccwpck_require__(2186);
 const main = async () => {
     try {
-        const [versions, architecture, modules, unityProjectPath] = await (0, inputs_1.ValidateInputs)();
+        const [versions, architecture, modules, unityProjectPath, installPath] = await (0, inputs_1.ValidateInputs)();
         if (unityProjectPath) {
             core.exportVariable('UNITY_PROJECT_PATH', unityProjectPath);
         }
         const unityHubPath = await unityHub.Get();
         core.exportVariable('UNITY_HUB_PATH', unityHubPath);
+        if (installPath.length > 0) {
+            await unityHub.setInstallPath(installPath);
+        }
         const editors = [];
         for (const [version, changeset] of versions) {
             const unityEditorPath = await unityHub.Unity(version, changeset, architecture, modules);

dist/index.js.map

@@ -4,9 +4,14 @@ sudo sh -c 'dbus-uuidgen >/etc/machine-id && mkdir -p /var/lib/dbus/ && ln -sf /
 echo "::group::Installing Unity Hub..."
 wget -qO - https://hub.unity3d.com/linux/keys/public | gpg --dearmor | sudo tee /usr/share/keyrings/Unity_Technologies_ApS.gpg >/dev/null
 sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/Unity_Technologies_ApS.gpg] https://hub.unity3d.com/linux/repos/deb stable main" > /etc/apt/sources.list.d/unityhub.list'
+echo "deb https://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee /etc/apt/sources.list.d/jammy.list
 sudo apt-get update
-sudo apt-get install -y --no-install-recommends unityhub ffmpeg
+sudo apt-get install -y --no-install-recommends unityhub ffmpeg libgtk2.0-0 libglu1-mesa libgconf-2-4 libncurses5
 sudo apt-get clean
+# Unity 2019.x/2020.x
+curl -LO https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb
+sudo dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb
+rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb
 sudo sed -i 's/^\(.*DISPLAY=:.*XAUTHORITY=.*\)\( "\$@" \)2>&1$/\1\2/' /usr/bin/xvfb-run
 sudo printf '#!/bin/bash\nxvfb-run --auto-servernum /opt/unityhub/unityhub "$@" 2>/dev/null' | sudo tee /usr/bin/unity-hub >/dev/null
 sudo chmod 777 /usr/bin/unity-hub

dist/install-unityhub-linux.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# https://discussions.unity.com/t/linux-editor-stuck-on-loading-because-of-bee-backend-w-workaround/854480
+set -e
+args=("$@")
+for ((i = 0; i < "${#args[@]}"; ++i)); do
+    case ${args[i]} in
+    --stdin-canary)
+        unset "args[i]"
+        break
+        ;;
+    esac
+done
+"$(dirname "$0")/.$(basename "$0")" "${args[@]}"

dist/linux-bee-backend-wrapper.sh

@@ -1,6 +1,6 @@
 {
   "name": "unity-setup",
-  "version": "1.0.14",
+  "version": "1.1.0",
   "description": "A GitHub action for setting up the Unity Game Engine for CI/CD workflows.",
   "author": "RageAgainstThePixel",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "yaml": "^2.8.0"
   },
   "devDependencies": {
-    "@types/node": "^22.15.18",
+    "@types/node": "^22.16.3",
     "@types/semver": "^7.7.0",
     "@vercel/ncc": "^0.34.0",
     "shx": "^0.3.4",
@@ -44,4 +44,4 @@
     "watch": "ncc build src/index.ts -o dist --source-map --license licenses.txt --watch",
     "clean": "npm install && shx rm -rf dist/ out/ node_modules/ && npm ci"
   }
-}
+}

package-lock.json

@@ -5,12 +5,17 @@ import core = require('@actions/core');
 
 const main = async () => {
     try {
-        const [versions, architecture, modules, unityProjectPath] = await ValidateInputs();
+        const [versions, architecture, modules, unityProjectPath, installPath] = await ValidateInputs();
         if (unityProjectPath) {
             core.exportVariable('UNITY_PROJECT_PATH', unityProjectPath);
         }
         const unityHubPath = await unityHub.Get();
         core.exportVariable('UNITY_HUB_PATH', unityHubPath);
+
+        if (installPath.length > 0) {
+            await unityHub.setInstallPath(installPath);
+        }
+
         const editors = [];
         for (const [version, changeset] of versions) {
             const unityEditorPath = await unityHub.Unity(version, changeset, architecture, modules);