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..daa18a1d 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -25,6 +25,8 @@ jobs: arch: i686 - os: macOS-10.15 arch: x86_64 + - os: macos-13-xlarge + arch: arm64 steps: - uses: actions/checkout@v2 @@ -44,7 +46,7 @@ jobs: 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 }} run: | python -m cibuildwheel --output-dir wheelhouse python/ diff --git a/python/pyproject.toml b/python/pyproject.toml index 1f1f5c1a..fb80065f 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [tool.cibuildwheel] before-build = [ - """cmake \ + """${PRIVILEGES} cmake \ -S . \ -B build \ -DCMAKE_BUILD_TYPE=Release \ @@ -18,7 +18,7 @@ before-build = [ -DBUILD_PYTHON=OFF \ -DBUILD_BIN=OFF \ """, - """cmake \ + """${PRIVILEGES} cmake \ --build build \ --parallel \ --target install \ @@ -55,11 +55,14 @@ test-command = [ ] [tool.cibuildwheel.linux] -manylinux-x86_64-image = "manylinux2010" +before-all = "yum install blas-devel" +manylinux-x86_64-image = "manylinux2014" +manylinux-i686-image = "manylinux2014" +manylinux-aarch64-image = "manylinux2014" [[tool.cibuildwheel.overrides]] select = "cp311*" manylinux-x86_64-image = "manylinux2014" [tool.cibuildwheel.macos] -environment = { CXXFLAGS="-L/usr/local/lib" } +environment = { CXXFLAGS="-L/usr/local/lib", PRIVILEGES="sudo" }