[email protected] (#28)

- fix macos hub update

Author: StephenHodgson

.github/workflows/validate.yml

@@ -35,6 +35,7 @@ jobs:
       contents: read
     strategy:
       matrix: ${{ fromJSON(needs.setup.outputs.jobs) }}
+      fail-fast: false
     secrets: inherit
     uses: ./.github/workflows/build.yml
     with:

dist/install-unityhub-macos.sh

@@ -24,9 +24,11 @@ if [ -z "${volumes}" ]; then
 fi
 echo "Mounted volumes:"
 echo "${volumes}"
-volume=$(echo "${volumes}" | grep -o "/Volumes/Unity Hub.*-${cpuArch}" | head -n1)
+# can be "/Volumes/Unity Hub 3.13.1-arm64" or "/Volumes/Unity Hub 3.13.1"
+volume=$(echo "${volumes}" | grep -o "/Volumes/Unity Hub.*" | head -n1)
 if [ -z "${volume}" ]; then
-    echo "Failed to mount ${downloadPath}"
+    hdiutil unmount "${volumes}" -quiet
+    echo "Failed to find Unity Hub volume in ${volumes}"
     exit 1
 fi
 appPath=$(find "${volume}" -name "*.app" | head -n1)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-setup",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A GitHub action for setting up the Unity Game Engine for CI/CD workflows.",
   "author": "Buildalon",
   "license": "MIT",

package.json

@@ -24,9 +24,11 @@ if [ -z "${volumes}" ]; then
 fi
 echo "Mounted volumes:"
 echo "${volumes}"
-volume=$(echo "${volumes}" | grep -o "/Volumes/Unity Hub.*-${cpuArch}" | head -n1)
+# can be "/Volumes/Unity Hub 3.13.1-arm64" or "/Volumes/Unity Hub 3.13.1"
+volume=$(echo "${volumes}" | grep -o "/Volumes/Unity Hub.*" | head -n1)
 if [ -z "${volume}" ]; then
-    echo "Failed to mount ${downloadPath}"
+    hdiutil unmount "${volumes}" -quiet
+    echo "Failed to find Unity Hub volume in ${volumes}"
     exit 1
 fi
 appPath=$(find "${volume}" -name "*.app" | head -n1)