From 6241ef3cd6ef1796f0a1cb99cf5bca134c50832b Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 6 Mar 2024 08:24:37 +0100 Subject: [PATCH 1/3] cmake: sync submodule --- cmake-module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-module b/cmake-module index ec504cc66..bf135ef4b 160000 --- a/cmake-module +++ b/cmake-module @@ -1 +1 @@ -Subproject commit ec504cc662be036ba1ed07fc3c9c9c3d0af29cdd +Subproject commit bf135ef4bcda2a6e897a00d4001bfe0c4acb1c45 From 494a4032c0c18afaeb37c47a38571e86991e84fa Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 6 Mar 2024 23:00:05 +0100 Subject: [PATCH 2/3] cmake: sync submodule --- cmake-module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-module b/cmake-module index bf135ef4b..baf48a3ec 160000 --- a/cmake-module +++ b/cmake-module @@ -1 +1 @@ -Subproject commit bf135ef4bcda2a6e897a00d4001bfe0c4acb1c45 +Subproject commit baf48a3ecb96f8dcad616aec006d43cce3307e19 From 50b5d78968579732979d415d7de8a346cb2a8b7e Mon Sep 17 00:00:00 2001 From: Fabian Schramm <55981657+fabinsch@users.noreply.github.com> Date: Thu, 7 Mar 2024 18:11:24 +0100 Subject: [PATCH 3/3] ci/release: switch from self-hosted to github macos-14 --- .github/workflows/release-osx-win.yml | 28 ++++++++++++--------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-osx-win.yml b/.github/workflows/release-osx-win.yml index c5b1c9636..f7fc07fa4 100644 --- a/.github/workflows/release-osx-win.yml +++ b/.github/workflows/release-osx-win.yml @@ -13,14 +13,14 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - os: [macos-latest, self-hosted-arm64, windows-2019, windows-latest] + os: [macos-latest, macos-14, windows-2019, windows-latest] include: - os: windows-2019 toolset: ClangCl - os: windows-latest toolset: v143 exclude: - - os: self-hosted-arm64 + - os: macos-14 python-version: 3.7 steps: - uses: actions/checkout@v2 @@ -35,7 +35,7 @@ jobs: git submodule update - name: Setup conda - if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows') + if: contains(matrix.os, 'macos-latest') || contains(matrix.os, 'windows') uses: conda-incubator/setup-miniconda@v2 with: miniforge-variant: Mambaforge @@ -44,6 +44,15 @@ jobs: python-version: ${{ matrix.python-version }} activate-environment: proxsuite + - name: Setup conda + if: matrix.os == 'macos-14' + uses: conda-incubator/setup-miniconda@v3 + with: + channels: conda-forge + python-version: ${{ matrix.python-version }} + 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] if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows') shell: bash -l {0} @@ -77,19 +86,6 @@ jobs: run: | pip wheel . -w dist - - - name: Build wheel on self-hosted - if: contains(matrix.os, 'self-hosted') - env : - CMEEL_CMAKE_ARGS: "-DBUILD_TESTING=OFF -DBUILD_PYTHON_INTERFACE=ON -DBUILD_WITH_VECTORIZATION_SUPPORT=OFF -DINSTALL_DOCUMENTATION=OFF" - shell: bash -l {0} - run: | - conda activate proxarm-py${{ matrix.python-version }} - conda info - mamba list - env - pip wheel . -w dist - - name: Move proxsuite to specific dist folder shell: bash -l {0} run: |