Skip to content

Commit

Permalink
Switch robotology conda binary packages generation to target osx-arm6…
Browse files Browse the repository at this point in the history
…4 instead of osx-64
  • Loading branch information
traversaro authored Sep 13, 2024
1 parent 95ac373 commit 15135ee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/generate-conda-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
include:
- os: ubuntu-20.04
conda_platform: linux-64
- os: macos-11.0
conda_platform: osx-64
- os: macos-14
conda_platform: osx-arm64
- os: windows-2019
conda_platform: win-64

Expand All @@ -79,11 +79,11 @@ jobs:
- name: Install files to enable compilation of mex files [Conda/macOS]
if: contains(matrix.os, 'macos')
run: |
curl -L -O https://github.com/robotology/robotology-vcpkg-ports/releases/download/storage/msdk_R2020a_mexmaci64.zip
unzip msdk_R2020a_mexmaci64.zip
rm msdk_R2020a_mexmaci64.zip
echo "GHA_Matlab_ROOT_DIR=${GITHUB_WORKSPACE}/msdk_R2020a_mexmaci64" >> $GITHUB_ENV
echo "GHA_Matlab_MEX_EXTENSION=mexmaci64" >> $GITHUB_ENV
curl -L -O https://github.com/robotology/robotology-vcpkg-ports/releases/download/storage/msdk_R2023b_mexmaca64.zip
unzip msdk_R2023b_mexmaca64.zip
rm msdk_R2023b_mexmaca64.zip
echo "GHA_Matlab_ROOT_DIR=${GITHUB_WORKSPACE}/msdk_R2023b_mexmaca64" >> $GITHUB_ENV
echo "GHA_Matlab_MEX_EXTENSION=mexmaca64" >> $GITHUB_ENV
- name: Install files to enable compilation of mex files [Conda/Windows]
if: contains(matrix.os, 'windows')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate-non-periodical-conda-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
include:
- os: ubuntu-20.04
conda_platform: linux-64
- os: macos-11.0
conda_platform: osx-64
- os: macos-14
conda_platform: osx-arm64
- os: windows-2019
conda_platform: win-64

Expand Down

0 comments on commit 15135ee

Please sign in to comment.