From 5efc28c2f2c1da90fb27e88166f7f4572132f86c Mon Sep 17 00:00:00 2001
From: Matteo Di Lena <dilena.matteo@gmail.com>
Date: Mon, 4 Dec 2023 20:14:34 +0000
Subject: [PATCH] Some more workflow fixes and updated .mod file (#25)

* Update main.yml

Attempt at compiling x86_64 and arm64 together in the same run, hopefully getting a single library compatible with both.

* Update main.yml

Trying wrapping the Maya 2024 macos architectures in quotes to fix build

* Update main.yml

Removing architecture from macos builds as it looks like targeting for both arm and x64 works in a single bundle.

* Update TwistSpline.mod
---
 .github/workflows/main.yml |  9 ++++-----
 TwistSpline.mod            | 36 +++++++++---------------------------
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14e04e2..1741d6a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -84,8 +84,6 @@ jobs:
             devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_5_Update_DEVKIT_Mac.dmg"
           - maya: "2023"
             devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_3_Update_DEVKIT_Mac.dmg"
-          - maya: "2024"
-            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2024/Autodesk_Maya_2024_2_Update_DEVKIT_Mac.dmg"
 
     steps:
       - name: Checkout code
@@ -117,10 +115,11 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: mac-${{matrix.maya}}-x86_64
+          name: mac-${{matrix.maya}}
           path: |
             artifacts/plug-ins/TwistSpline.bundle
 
+  # This will be compiled for both x86_64 and arm64 architectures, as arm support has been added starting from Maya 2024.
   maya-macos-arm64:
     runs-on: macos-latest
 
@@ -149,7 +148,7 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -G Xcode -DCMAKE_OSX_ARCHITECTURES=arm64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_BASE="/Volumes/devkitBase"
+          cmake -G Xcode -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_BASE="/Volumes/devkitBase"
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
@@ -162,7 +161,7 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: mac-${{matrix.maya}}-arm64
+          name: mac-${{matrix.maya}}
           path: |
             artifacts/plug-ins/TwistSpline.bundle
 
diff --git a/TwistSpline.mod b/TwistSpline.mod
index 5802ae6..fdf23ad 100644
--- a/TwistSpline.mod
+++ b/TwistSpline.mod
@@ -1,30 +1,3 @@
-+ PLATFORM:win64 MAYAVERSION:2018 TwistSpline 1.0.0 TwistSpline
-plug-ins: windows-2018
-
-+ PLATFORM:linux MAYAVERSION:2018 TwistSpline 1.0.0 TwistSpline
-plug-ins: linux-2018
-
-+ PLATFORM:mac MAYAVERSION:2018 TwistSpline 1.0.0 TwistSpline
-plug-ins: mac-2018
-
-+ PLATFORM:win64 MAYAVERSION:2019 TwistSpline 1.0.0 TwistSpline
-plug-ins: windows-2019
-
-+ PLATFORM:linux MAYAVERSION:2019 TwistSpline 1.0.0 TwistSpline
-plug-ins: linux-2019
-
-+ PLATFORM:mac MAYAVERSION:2019 TwistSpline 1.0.0 TwistSpline
-plug-ins: mac-2019
-
-+ PLATFORM:win64 MAYAVERSION:2020 TwistSpline 1.0.0 TwistSpline
-plug-ins: windows-2020
-
-+ PLATFORM:linux MAYAVERSION:2020 TwistSpline 1.0.0 TwistSpline
-plug-ins: linux-2020
-
-+ PLATFORM:mac MAYAVERSION:2020 TwistSpline 1.0.0 TwistSpline
-plug-ins: mac-2020
-
 + PLATFORM:win64 MAYAVERSION:2022 TwistSpline 1.0.0 TwistSpline
 plug-ins: windows-2022
 
@@ -42,3 +15,12 @@ plug-ins: linux-2023
 
 + PLATFORM:mac MAYAVERSION:2023 TwistSpline 1.0.0 TwistSpline
 plug-ins: mac-2023
+
++ PLATFORM:win64 MAYAVERSION:2024 TwistSpline 1.0.0 TwistSpline
+plug-ins: windows-2024
+
++ PLATFORM:linux MAYAVERSION:2024 TwistSpline 1.0.0 TwistSpline
+plug-ins: linux-2024
+
++ PLATFORM:mac MAYAVERSION:2024 TwistSpline 1.0.0 TwistSpline
+plug-ins: mac-2024