Skip to content

Commit

Permalink
ci/macos: use github macos-14
Browse files Browse the repository at this point in the history
  • Loading branch information
fabinsch committed Mar 6, 2024
1 parent b454363 commit 343a296
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/ci-linux-osx-win-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
build_type: [Release, Debug]
name: [ubuntu-latest, macos-latest, windows-2019-clang-cl, windows-latest]
name: [ubuntu-latest, macos-latest, windows-2019-clang-cl, windows-latest, macos-14]
cxx_std: [17, 20]
continue_on_error: [false]

Expand All @@ -22,6 +22,8 @@ jobs:
os: ubuntu-latest
- name: macos-latest
os: macos-latest
- name: macos-14
os: macos-14
- name: windows-2019-clang-cl
os: windows-2019
compiler: clang-cl
Expand Down Expand Up @@ -55,14 +57,25 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
if: matrix.os != 'macos-14'
with:
miniforge-variant: Mambaforge
miniforge-version: latest
channels: conda-forge
python-version: "3.10"
activate-environment: proxsuite

- uses: conda-incubator/setup-miniconda@v3
if: matrix.os == 'macos-14'
with:
miniforge-variant: Mambaforge
miniforge-version: latest
channels: conda-forge
python-version: "3.10"
activate-environment: proxsuite
installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh

- name: Install dependencies [Conda]
shell: bash -l {0}
run: |
Expand Down

0 comments on commit 343a296

Please sign in to comment.