Skip to content

Commit

Permalink
modernize cd for macos arm wheels
Browse files Browse the repository at this point in the history
  • Loading branch information
pantor committed Apr 21, 2024
1 parent de4cbf2 commit 9e38d33
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
18 changes: 7 additions & 11 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,21 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-latest, windows-latest, macos-13, macos-14]

steps:
- uses: actions/checkout@v4

- name: Build wheels
uses: pypa/cibuildwheel@v2.16.2
uses: pypa/cibuildwheel@v2.17.0
env:
CIBW_ARCHS_LINUX: auto
CIBW_ARCHS_MACOS: x86_64 arm64
CIBW_BEFORE_ALL: |
git clone https://github.com/pybind/pybind11.git
cd pybind11
git checkout v2.11.1
CIBW_BEFORE_ALL: git clone --depth 1 --branch v2.12.0 https://github.com/pybind/pybind11.git
CIBW_SKIP: pp* # Skip PyPy
MACOSX_DEPLOYMENT_TARGET: "10.14"

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels-${{ matrix.os }}-${{ strategy.job-index }}
path: ./wheelhouse/*.whl


Expand All @@ -42,7 +38,7 @@ jobs:
- name: Build SDist
run: pipx run build --sdist

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*.tar.gz

Expand All @@ -55,7 +51,7 @@ jobs:
id-token: write

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: echo "HIDDEN=$(python3 -c "import os; print(os.devnull)")" >> $GITHUB_ENV

- name: Install pybind11
run: git clone --depth 1 --branch v2.11.1 https://github.com/pybind/pybind11.git
run: git clone --depth 1 --branch v2.12.0 https://github.com/pybind/pybind11.git

- name: Install valgrind
if: matrix.os == 'ubuntu-latest'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ For trajectories with intermediate waypoints, we compare Ruckig to [Toppra](http
Ruckig is written in C++17. It is continuously tested on `ubuntu-latest`, `macos-latest`, and `windows-latest` against following versions

- Doctest v2.4 (only for testing)
- Pybind11 v2.11 (only for python wrapper)
- Pybind11 v2.12 (only for Python wrapper)

A C++11 and C++03 version of Ruckig is also available - please contact us if you're interested.

Expand Down

0 comments on commit 9e38d33

Please sign in to comment.