Skip to content

Commit

Permalink
Merge pull request #306 from fabinsch/ci-macos-14
Browse files Browse the repository at this point in the history
Use github macos-14-arm64 runners instead of self-hosted
  • Loading branch information
jcarpent authored Mar 7, 2024
2 parents b454363 + c193f84 commit 57de257
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 92 deletions.
31 changes: 27 additions & 4 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 @@ -56,13 +58,22 @@ jobs:
- uses: actions/checkout@v2

- uses: conda-incubator/setup-miniconda@v2
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:
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 All @@ -76,7 +87,7 @@ jobs:
mamba install libmatio numpy scipy
- name: Install julia [macOS/Linux]
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
if: contains(matrix.os, 'macos-latest') || contains(matrix.os, 'ubuntu')
shell: bash -l {0}
run: |
mamba install julia
Expand All @@ -95,7 +106,7 @@ jobs:
env
- name: Configure [Conda/Linux&macOS]
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
if: contains(matrix.os, 'macos-latest') || contains(matrix.os, 'ubuntu')
shell: bash -l {0}
run: |
echo $(whereis ccache)
Expand All @@ -105,8 +116,20 @@ jobs:
cd build
cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON -DTEST_JULIA_INTERFACE:BOOL=ON -DOpenMP_ROOT=$CONDA_PREFIX
- name: Configure [Conda/macOS14]
if: contains(matrix.os, 'macos-14')
shell: bash -l {0}
run: |
echo $(whereis ccache)
echo $(which ccache)
git submodule update --init
mkdir build
cd build
cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON -DTEST_JULIA_INTERFACE:BOOL=OFF -DOpenMP_ROOT=$CONDA_PREFIX
- name: Configure [Conda/macOS-debug/CheckMalloc]
if: contains(matrix.os, 'macos') && contains(matrix.build_type, 'Debug')
if: contains(matrix.os, 'macos-latest') && contains(matrix.build_type, 'Debug')
shell: bash -l {0}
run: |
echo $(whereis ccache)
Expand Down
88 changes: 0 additions & 88 deletions .github/workflows/ci-osx-arm64-conda.yml

This file was deleted.

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

### What's Changed
* Switch from self-hosted runner for macos-14-ARM to runner from github ([#306](https://github.com/Simple-Robotics/proxsuite/pull/306))

## [0.6.4] - 2024-03-01

### What's Changed
Expand Down

0 comments on commit 57de257

Please sign in to comment.