Skip to content

Commit 6a0ebc5

Browse files
authored
Merge pull request #439 from jcarpent/topic/devel
Activate build on macos-14-arm64
2 parents 6e8c95b + 14eeee7 commit 6a0ebc5

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

.github/workflows/macos-linux-conda.yml

+18-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: ["ubuntu-latest", "macos-latest"]
21+
os: ["ubuntu-latest", "macos-latest","macos-14"]
2222
cxx_options: ['', '-mavx2']
2323
build_type: [Release, Debug]
2424
python-version: ["3.8", "3.12"]
@@ -30,6 +30,12 @@ jobs:
3030
- build_type: Release
3131
cxx_options: -mavx2
3232
os: macos-latest
33+
- build_type: Debug
34+
cxx_options: -mavx2
35+
os: macos-14
36+
- build_type: Release
37+
cxx_options: -mavx2
38+
os: macos-14
3339

3440
steps:
3541
- uses: actions/checkout@v4
@@ -43,12 +49,23 @@ jobs:
4349
restore-keys: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ matrix.python-version }}-
4450

4551
- uses: conda-incubator/setup-miniconda@v3
52+
if: matrix.os != 'macos-14'
53+
with:
54+
activate-environment: eigenpy
55+
auto-update-conda: true
56+
environment-file: .github/workflows/conda/environment_macos_linux.yml
57+
python-version: ${{ matrix.python-version }}
58+
auto-activate-base: false
59+
60+
- uses: conda-incubator/setup-miniconda@v3
61+
if: matrix.os == 'macos-14'
4662
with:
4763
activate-environment: eigenpy
4864
auto-update-conda: true
4965
environment-file: .github/workflows/conda/environment_macos_linux.yml
5066
python-version: ${{ matrix.python-version }}
5167
auto-activate-base: false
68+
installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh
5269

5370
- name: Build EigenPy
5471
shell: bash -el {0}

0 commit comments

Comments
 (0)