Switch arm for the mac python lib

blurstudio · Sep 13, 2024 · ecc9a14 · ecc9a14
1 parent 931482e
commit ecc9a14
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,10 +20,8 @@ jobs:
   compile_plugin:
     strategy:
       matrix:
-        # Sorry MacOS, The switch to ARM is maiking this too complicated
-        # If somebody wants to get it working, PR's welcome
         maya: [2022, 2023, 2024, 2025]
-        os: [macos-13, ubuntu-latest, windows-latest]
+        os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
         include: 
           # Add the maya update versions here
           - maya: 2022
@@ -35,8 +33,12 @@ jobs:
           - maya: 2025
             update: 1
 
-        # cross-compiling is annoying so just skip the newer maya versions
+        # cross-compiling is annoying so just fall back to macos-13
         exclude: 
+          - os: macos-latest
+            maya: 2022
+          - os: macos-latest
+            maya: 2023
           - os: macos-13
             maya: 2024
           - os: macos-13
@@ -79,9 +81,9 @@ jobs:
   compile_python:
     strategy:
       matrix:
-        # Sorry MacOS, The switch to ARM is maiking this too complicated
-        # If somebody wants to get it working, PR's welcome
-        os: [macos-13, ubuntu-latest, windows-latest]
+        # Sorry x86 MacOS, The switch to ARM is maiking this too complicated
+        # Maya modules don't detect the architecture of the OS, so I've gotta pick 
+        os: [macos-latest, ubuntu-latest, windows-latest]
 
       fail-fast: false
 
@@ -90,10 +92,20 @@ jobs:
       - uses: actions/checkout@v4
       - run: git fetch --force --tags origin
 
+      - name: Get pyver macos-latest
+        if: ${{ matrix.os == 'macos-latest' }}
+        shell: bash
+        run: echo "PY_VER=3.9" >> $GITHUB_ENV
+
+      - name: Get pyver
+        if: ${{ matrix.os != 'macos-latest' }}
+        shell: bash
+        run: echo "PY_VER=3.7" >> $GITHUB_ENV
+
       - name: Get an older python version 
         uses: actions/setup-python@v5
         with:
-          python-version: '3.7' 
+          python-version: ${{ env.PY_VER }}
 
       - name: Build Python
         uses: blurstudio/mayaModuleActions/mesonBuild@v1