diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3cc1fbc8..27408f22 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,6 +23,9 @@ jobs: analyzers: "cppcheck" scan: "scan-build --status-bugs" mkdoc: "-DBUILD_DOC=ON -DSPHINX_ARGS=-WT" + - os: macos-13-xlarge + privledges: "sudo" + arch: arm64 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml index 30d6bb33..7ca24354 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -25,6 +25,9 @@ jobs: arch: i686 - os: macOS-10.15 arch: x86_64 + - os: macos-13-xlarge + privileges: "sudo" + arch: arm64 steps: - uses: actions/checkout@v2 @@ -39,13 +42,31 @@ jobs: - name: Install cibuildwheel run: python -m pip install cibuildwheel + - name: Before build + run: | + ${{ matrix.privileges }} cmake \ + -S . \ + -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DBUILD_TESTING=OFF \ + -DBUILD_PYTHON=OFF \ + -DBUILD_BIN=OFF + ${{ matrix.privledges }} cmake \ + --build build \ + --parallel \ + --target install \ + --config Release \ + - name: Build wheels + shell: bash env: CIBW_ENVIRONMENT_WINDOWS: > CMAKE_GENERATOR="${{ matrix.cmake_generator }}" CMAKE_GENERATOR_PLATFORM="${{ matrix.cmake_generator_platform }}" - CIBW_SKIP: pp* *-musllinux_* + CIBW_SKIP: pp* *-musllinux_* cp312-* CIBW_ARCHS: ${{ matrix.arch }} + PRIVILEGES: ${{ matrix.privileges }} run: | python -m cibuildwheel --output-dir wheelhouse python/ diff --git a/python/pyproject.toml b/python/pyproject.toml index 1f1f5c1a..3f7590f3 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -7,25 +7,6 @@ requires = [ "pytest-runner", ] -[tool.cibuildwheel] -before-build = [ - """cmake \ - -S . \ - -B build \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DBUILD_TESTING=OFF \ - -DBUILD_PYTHON=OFF \ - -DBUILD_BIN=OFF \ - """, - """cmake \ - --build build \ - --parallel \ - --target install \ - --config Release \ - """, -] - test-requires = "pytest" # Copy out test folder to make sure that tests are runned against the wheel and