diff --git a/.github/workflows/ci-linux-osx-win-conda.yml b/.github/workflows/ci-linux-osx-win-conda.yml index f10e0a3bf..ea21da8b4 100644 --- a/.github/workflows/ci-linux-osx-win-conda.yml +++ b/.github/workflows/ci-linux-osx-win-conda.yml @@ -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] @@ -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 @@ -56,6 +58,7 @@ jobs: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 + if: matrix.os != 'macos-14' with: miniforge-variant: Mambaforge miniforge-version: latest @@ -63,6 +66,14 @@ jobs: 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: | @@ -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 @@ -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) @@ -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) diff --git a/.github/workflows/ci-osx-arm64-conda.yml b/.github/workflows/ci-osx-arm64-conda.yml deleted file mode 100644 index 81b935b3a..000000000 --- a/.github/workflows/ci-osx-arm64-conda.yml +++ /dev/null @@ -1,88 +0,0 @@ -name: CI - OSX ARM64 - Conda - -on: - push: - pull_request: - -env: - PYTHONPATH: ${CONDA_PREFIX}/lib/python3.8/site-packages/ - -jobs: - build-with-conda: - name: '[conda:${{ matrix.os }}:${{ matrix.build_type }}]' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - build_type: [Release, Debug] - name: [macos-m1] - - include: - - name: macos-m1 - os: self-hosted-arm64 - - steps: - - uses: actions/checkout@v2 - - # not working due to The node12 is not supported on macOS ARM64 platform. Use node16 instead. - # open issue https://github.com/conda-incubator/setup-miniconda/issues/247 - # - uses: conda-incubator/setup-miniconda@v2 - # with: - # activate-environment: proxarm - - - name: Environment - shell: bash -l {0} - run: | - echo $CONDA_PREFIX - conda info - conda list - env - - - name: Configure - shell: bash -l {0} - run: | - cd $GITHUB_WORKSPACE - git submodule update --init - mkdir build - cd build - cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DBUILD_WITH_VECTORIZATION_SUPPORT:BOOL=OFF -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PYTHON_EXE} -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON -DTEST_JULIA_INTERFACE:BOOL=OFF - - - name: Build - shell: bash -l {0} - run: | - cd $GITHUB_WORKSPACE/build - cmake --build . --config ${{ matrix.build_type }} -v - - - name: Install - shell: bash -l {0} - run: | - cd $GITHUB_WORKSPACE/build - cmake --install . --config ${{ matrix.build_type }} - - - - name: Test - shell: bash -l {0} - run: | - cd $GITHUB_WORKSPACE/build - ctest --output-on-failure -C ${{ matrix.build_type }} - - - - name: Uninstall [Conda] - shell: bash -l {0} - run: | - cd $GITHUB_WORKSPACE/build - cmake --build . --config ${{ matrix.build_type }} --target uninstall - - check: - if: always() - name: check-ci-osx-arm64-conda - - needs: - - build-with-conda - - runs-on: Ubuntu-latest - steps: - - name: Decide whether the needed jobs succeeded or failed - uses: re-actors/alls-green@release/v1 - with: - jobs: ${{ toJSON(needs) }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index cdaa5f6c8..0df6d85c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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