Removed osx-arm64 on github actions

pyomeca · Aug 14, 2024 · 9028d85 · 9028d85
1 parent d203f59
commit 9028d85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/publish_matlab_binaries.yml b/.github/workflows/publish_matlab_binaries.yml
@@ -11,14 +11,14 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
         include:
           - os: ubuntu-latest
             label: linux-64
             prefix: /usr/share/miniconda3/envs/ezc3d
-          - os: macos-latest
-            label: osx-arm64
-            prefix: /Users/runner/miniconda3/envs/ezc3d
+          # - os: macos-latest
+          #   label: osx-arm64
+          #   prefix: /Users/runner/miniconda3/envs/ezc3d
           - os: macos-13
             label: osx-intel
             prefix: /Users/runner/miniconda3/envs/ezc3d
@@ -62,9 +62,10 @@ jobs:
           cache: true
         if: matrix.label != 'osx-arm64' 
 
-      - name: Install MATLAB on MACOS-arm64
+      - name: Install MATLAB on MACOS-Arm64
         uses: matlab-actions/setup-matlab@v2
         with:
+          # The version of MATLAB of R2024a does not contain MX_LIBRARY
           release: R2023a
           cache: true
         if: matrix.label == 'osx-arm64'

diff --git a/.github/workflows/run_matlab_tests.yml b/.github/workflows/run_matlab_tests.yml
@@ -9,14 +9,14 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
         include:
           - os: ubuntu-latest
             label: linux-64
             prefix: /usr/share/miniconda3/envs/ezc3d
-          - os: macos-latest
-            label: osx-arm64
-            prefix: /Users/runner/miniconda3/envs/ezc3d
+          # - os: macos-latest
+          #   label: osx-arm64
+          #   prefix: /Users/runner/miniconda3/envs/ezc3d
           - os: macos-13
             label: osx-intel
             prefix: /Users/runner/miniconda3/envs/ezc3d
@@ -60,9 +60,10 @@ jobs:
           cache: true
         if: matrix.label != 'osx-arm64'
 
-      - name: Install MATLAB on MACOS
+      - name: Install MATLAB on MACOS-Arm64
         uses: matlab-actions/setup-matlab@v2
         with:
+          # The version of MATLAB of R2024a does not contain MX_LIBRARY
           release: R2023a
           cache: true
         if: matrix.label == 'osx-arm64'
@@ -80,7 +81,7 @@ jobs:
           make install -j${{ steps.cpu-cores.outputs.count }}
           cd $MAIN_FOLDER
         if: matrix.label != 'win-64'
-      
+
       - name: Build ezc3d on WINDOWS
         run: |
           MAIN_FOLDER=`pwd`

diff --git a/binding/matlab/CMakeLists.txt b/binding/matlab/CMakeLists.txt
@@ -51,18 +51,18 @@ foreach(SUFFIXES Read Write)
             )
         endif(CMAKE_CL_64)
     elseif(APPLE)
-        if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
             set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
                 SUFFIX ".mexmaci64"
                 PREFIX ""
             )
-        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") 
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") 
             set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
                 SUFFIX ".mexmaca64"
                 PREFIX ""
             )
         else()
-            message(FATAL_ERROR "Unknown architecture: ${CMAKE_SYSTEM_PROCESSOR}") 
+            message(FATAL_ERROR "Unknown architecture: ${CMAKE_HOST_SYSTEM_PROCESSOR}") 
         endif ()
     else()
         if (CMAKE_SIZEOF_VOID_P MATCHES "8")
@@ -76,7 +76,7 @@ foreach(SUFFIXES Read Write)
                 PREFIX ""
             )
         endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    endif(WIN32)
+    endif()
 
 
     # Set runtime path for linux