From a11c523170da3d41cf77e94eefc83e76644b1e13 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 10 Feb 2024 18:29:28 +0100 Subject: [PATCH 1/4] ci: activate build on macos-14-arm64 --- .github/workflows/macos-linux-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index 3f4f23f66..a01028728 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "macos-latest"] + os: ["ubuntu-latest", "macos-latest","macos-14-arm64"] cxx_options: ['', '-mavx2'] build_type: [Release, Debug] python-version: ["3.8", "3.12"] From 97037919f2a51bf20ffaf293a9560ebdca7fe60f Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 10 Feb 2024 18:32:17 +0100 Subject: [PATCH 2/4] ci: remove useless builds --- .github/workflows/macos-linux-conda.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index a01028728..1612d63aa 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -30,6 +30,12 @@ jobs: - build_type: Release cxx_options: -mavx2 os: macos-latest + - build_type: Debug + cxx_options: -mavx2 + os: macos-14-arm64 + - build_type: Release + cxx_options: -mavx2 + os: macos-14-arm64 steps: - uses: actions/checkout@v4 From 4d1130d116546364a97d0d0e1f086850ab2603ea Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 10 Feb 2024 20:33:21 +0100 Subject: [PATCH 3/4] ci/osx: fix os name --- .github/workflows/macos-linux-conda.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index 1612d63aa..b481c8ed0 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "macos-latest","macos-14-arm64"] + os: ["ubuntu-latest", "macos-latest","macos-14"] cxx_options: ['', '-mavx2'] build_type: [Release, Debug] python-version: ["3.8", "3.12"] @@ -32,10 +32,10 @@ jobs: os: macos-latest - build_type: Debug cxx_options: -mavx2 - os: macos-14-arm64 + os: macos-14 - build_type: Release cxx_options: -mavx2 - os: macos-14-arm64 + os: macos-14 steps: - uses: actions/checkout@v4 From 14eeee744d1db568e4c38ad57d05f3036880f34f Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 11 Feb 2024 07:34:12 +0100 Subject: [PATCH 4/4] ci/conda: fix for ARM64 See https://github.com/conda-incubator/setup-miniconda/issues/312 for details --- .github/workflows/macos-linux-conda.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index b481c8ed0..a64e61149 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -49,6 +49,7 @@ jobs: restore-keys: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ matrix.python-version }}- - uses: conda-incubator/setup-miniconda@v3 + if: matrix.os != 'macos-14' with: activate-environment: eigenpy auto-update-conda: true @@ -56,6 +57,16 @@ jobs: python-version: ${{ matrix.python-version }} auto-activate-base: false + - uses: conda-incubator/setup-miniconda@v3 + if: matrix.os == 'macos-14' + with: + activate-environment: eigenpy + auto-update-conda: true + environment-file: .github/workflows/conda/environment_macos_linux.yml + python-version: ${{ matrix.python-version }} + auto-activate-base: false + installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh + - name: Build EigenPy shell: bash -el {0} run: |