diff --git a/.github/workflows/publish_matlab_binaries.yml b/.github/workflows/publish_matlab_binaries.yml index 28c066d2..087aac1e 100644 --- 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-13, windows-latest] + os: [ubuntu-latest, macos-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 @@ -54,20 +54,12 @@ jobs: conda list git submodule update --init --recursive - - name: Install MATLAB on WINDOWS, LINUX and MACOS-Intel + - name: Install MATLAB uses: matlab-actions/setup-matlab@v2 with: cache: true if: matrix.label != 'osx-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' - - name: Build ezc3d on UNIX run: | MAIN_FOLDER=`pwd` diff --git a/.github/workflows/run_matlab_tests.yml b/.github/workflows/run_matlab_tests.yml index 42f67581..2d08b1b6 100644 --- 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-13, windows-latest] + os: [ubuntu-latest, macos-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 @@ -52,20 +52,11 @@ jobs: conda list git submodule update --init --recursive - - name: Install MATLAB on WINDOWS and LINUX + - name: Install MATLAB uses: matlab-actions/setup-matlab@v2 with: cache: true - if: matrix.label != 'osx-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' - + - name: Build ezc3d on UNIX run: | MAIN_FOLDER=`pwd`