xrtk/[email protected] (#34)

- default apple cpu arch

Author: StephenHodgson

.github/workflows/validate.yml

@@ -31,7 +31,6 @@ jobs:
             build-targets: 'StandaloneWindows64 Android iOS'
           - os: macos-14
             build-targets: 'StandaloneOSX Android iOS'
-            arch: 'arm64'
           - os: macos-latest
             build-targets: 'StandaloneOSX Android iOS'
 
@@ -51,7 +50,6 @@ jobs:
         id: unity-setup
         with:
           build-targets: '${{ matrix.build-targets }}'
-          architecture: '${{ matrix.arch }}'
 
       - run: |
           echo "${{ env.UNITY_EDITOR_PATH }}"

dist/index.js

@@ -28074,6 +28074,14 @@ const main = async () => {
 
         if (architecture) {
             core.debug(`architecture: ${architecture}`);
+        } else {
+            if (os.type() == 'Darwin') {
+                if (os.arch() == 'arm64') {
+                    architecture = 'arm64';
+                } else if (os.arch() == 'x64') {
+                    architecture = 'x86_64';
+                }
+            }
         }
 
         var buildTargets = core.getInput('build-targets');

dist/unity-install.ps1

@@ -245,7 +245,7 @@ if (-not (Test-Path -Path $editorPath)) {
     $installArgs = @('install',"--version $unityVersion","--changeset $unityVersionChangeSet",'--cm')
     $installModules = AddModules
 
-    if (-not [string]::IsNullOrEmpty($architecture) -and $architecture -ne 'x86_64') {
+    if (-not [string]::IsNullOrEmpty($architecture)) {
         $installArgs += "-a $architecture"
     }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-setup",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "An atomic GitHub action to download and install the Unity Editor for runners.",
   "main": "src/index.js",
   "scripts": {

package.json

@@ -13,6 +13,14 @@ const main = async () => {
 
         if (architecture) {
             core.debug(`architecture: ${architecture}`);
+        } else {
+            if (os.type() == 'Darwin') {
+                if (os.arch() == 'arm64') {
+                    architecture = 'arm64';
+                } else if (os.arch() == 'x64') {
+                    architecture = 'x86_64';
+                }
+            }
         }
 
         var buildTargets = core.getInput('build-targets');

src/index.js

@@ -245,7 +245,7 @@ if (-not (Test-Path -Path $editorPath)) {
     $installArgs = @('install',"--version $unityVersion","--changeset $unityVersionChangeSet",'--cm')
     $installModules = AddModules
 
-    if (-not [string]::IsNullOrEmpty($architecture) -and $architecture -ne 'x86_64') {
+    if (-not [string]::IsNullOrEmpty($architecture)) {
         $installArgs += "-a $architecture"
     }