unity-setup@v1.0.14 (#30)

- fixed unity hub updates on self-hosted runners
- fixed unity hub installation/updates on self-hosted mac runners
- attempt to fix editor by removing any invalid installs before attempting to re-install

Author: StephenHodgson

.github/workflows/update-release-tags.yml

@@ -1,7 +1,7 @@
 name: Update Release Tags
 on:
   push:
-    tags: '*'
+    tags: ['*']
   workflow_dispatch:
 jobs:
   update-release-tags:
@@ -13,6 +13,3 @@ jobs:
         with:
           fetch-depth: 0
       - uses: RageAgainstThePixel/update-action-release-tags@v1
-        with:
-          update-major: true
-          update-minor: true

.github/workflows/validate.yml

@@ -3,18 +3,18 @@ on:
   schedule:
     - cron: '0 0 * * 0' # Run every Sunday at midnight
   push:
-    branches:
-      - 'main'
+    branches: ['main']
   pull_request:
-    branches:
-      - '*'
+    branches: ['*']
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   validate:
+    permissions:
+      contents: read
     env:
       UNITY_EDITORS: '' # set by the unity-setup action
       UNITY_HUB_PATH: '' # set by the unity-setup action

dist/index.js

@@ -2,8 +2,15 @@
 set -e
 echo "::group::Installing Unity Hub..."
 baseUrl="https://public-cdn.cloud.unity3d.com/hub/prod"
-url="$baseUrl/UnityHubSetup.dmg"
-downloadPath="$RUNNER_TEMP/UnityHubSetup.dmg"
+cpuArch=$(uname -m)
+if [ "$cpuArch" == "arm64" ]; then
+    cpuArch="arm64"
+else
+    cpuArch="x64"
+fi
+fileName="UnityHubSetup"
+url="$baseUrl/$fileName-$cpuArch.dmg"
+downloadPath="$RUNNER_TEMP/$fileName-$cpuArch.dmg"
 echo "Downloading Unity Hub from $url to $downloadPath..."
 wget -qO "$downloadPath" "$url"
 if [ ! -f "$downloadPath" ]; then

dist/index.js.map

@@ -442,19 +442,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-uuid
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2010-2020 Robert Kieffer and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 wrappy
 ISC
 The ISC License

dist/install-unityhub-macos.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+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'
+sudo apt-get update --allow-releaseinfo-change
+sudo apt-get install -y --no-install-recommends --only-upgrade unityhub