From 15135ee0211e44f2ba54c1a9e291fb7554e9d2ab Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 13 Sep 2024 09:28:43 +0300 Subject: [PATCH 1/2] Switch robotology conda binary packages generation to target osx-arm64 instead of osx-64 --- .github/workflows/generate-conda-packages.yaml | 14 +++++++------- .../generate-non-periodical-conda-package.yaml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/generate-conda-packages.yaml b/.github/workflows/generate-conda-packages.yaml index 8ecd4c9a0..78831b032 100644 --- a/.github/workflows/generate-conda-packages.yaml +++ b/.github/workflows/generate-conda-packages.yaml @@ -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 @@ -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') diff --git a/.github/workflows/generate-non-periodical-conda-package.yaml b/.github/workflows/generate-non-periodical-conda-package.yaml index 331d05f17..3745fe868 100644 --- a/.github/workflows/generate-non-periodical-conda-package.yaml +++ b/.github/workflows/generate-non-periodical-conda-package.yaml @@ -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 From 1732356071f617760e5a533163bed0dfcbb3c4ed Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Sep 2024 17:19:04 +0200 Subject: [PATCH 2/2] Change docs to report that all packages should be available in osx-arm64 --- doc/conda-forge.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/conda-forge.md b/doc/conda-forge.md index 691a587fe..df0651e01 100644 --- a/doc/conda-forge.md +++ b/doc/conda-forge.md @@ -19,12 +19,14 @@ Depending on the speficic package, the binary packages are hosted either in [`co The following conda platforms are supported by all packages of the robotology-superbuild: * `linux-64` (Linux on x86-64) -* `osx-64` (macOS on x86-64) +* `osx-arm64` (macOS on ARM 64-bit) * `win-64` (Windows on x86-64) Some packages are also available for: * `linux-aarch64` (Linux on ARM 64-bit) -* `osx-arm64` (macOS on ARM 64-bit) +* `osx-64` (macOS on x86-64) + +As the switch from building the `robotology` channel packages from `osx-64` to `osx-arm64` happened in September 2024 (see https://github.com/robotology/robotology-superbuild/pull/1712), it may happen that some older packages are only available for `osx-64` and not `osx-arm64`. If you need a binary package on a platform in which it is not available, feel free to [open an issue](https://github.com/robotology/robotology-superbuild/issues/new) requesting it.