diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 532a118..6073f17 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -2,6 +2,11 @@ name: Wheels on: push: + branches: + - main + pull_request: + branches: + - main release: types: - published @@ -23,7 +28,7 @@ jobs: - name: Build sdist env: - BLAZINGMQ_PYTHON_NO_PKGCONFIG: ’1’ + BLAZINGMQ_PYTHON_NO_PKGCONFIG: '1' run: pipx run build --sdist - uses: actions/upload-artifact@v4 @@ -85,11 +90,10 @@ jobs: run: | echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 + uses: pypa/cibuildwheel@v3.4.1 env: CIBW_ARCHS_LINUX: ${{ matrix.cibw_arch }} CIBW_BUILD: ${{ matrix.cibw_python }}-* - CIBW_PRERELEASE_PYTHONS: True CIBW_TEST_COMMAND: python3 -m pytest {project}/tests/unit CIBW_TEST_REQUIRES: pytest mock pkgconfig - uses: actions/upload-artifact@v4 @@ -130,12 +134,11 @@ jobs: run: | echo "CFLAGS=-target arm64-apple-macos14" >> $GITHUB_ENV - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 + uses: pypa/cibuildwheel@v3.4.1 env: CIBW_ARCHS_MACOS: ${{ matrix.cibw_arch }} CIBW_BUILD: ${{ matrix.cibw_python }}-* CIBW_BUILD_VERBOSITY: 1 - CIBW_PRERELEASE_PYTHONS: True CIBW_TEST_COMMAND: python3 -m pytest {project}/tests/unit CIBW_TEST_REQUIRES: pytest mock pkgconfig MACOSX_DEPLOYMENT_TARGET: "14.0" diff --git a/bin/build-macos-universal.sh b/bin/build-macos-universal.sh index 8ce42e6..2ce2e4e 100755 --- a/bin/build-macos-universal.sh +++ b/bin/build-macos-universal.sh @@ -2,23 +2,17 @@ # This script builds BlazingMQ and all of its dependencies for MacOS 11.0. # -# Before running this script, install following prerequisites, if not present -# yet, by copy-and-pasting the commands between `<=39.2.0', 'Cython>=0.28.4, <3; python_version < "3.8"', 'Cython >= 3, <4; python_version >= "3.8"', 'wheel>=0.31.0', + 'packaging>=24.2', 'pkgconfig>1.5.0'] build-backend = "setuptools.build_meta" @@ -53,8 +54,7 @@ directory = "news" [tool.cibuildwheel] build = ["cp39-*", "cp310-*", "cp311-*", "cp312-*"] skip = "*-musllinux_*" -manylinux-x86_64-image = "manylinux2014" -manylinux-i686-image = "manylinux2014" +manylinux-x86_64-image = "manylinux_2_28" [tool.cibuildwheel.linux.environment] PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig" @@ -64,13 +64,13 @@ PKG_CONFIG_PATH="install/lib/pkgconfig" [tool.cibuildwheel.linux] before-all = [ - "yum install -y gdb curl pkgconfig ninja-build flex flex-devel zlib-devel openssl-devel", + "dnf install -y gdb curl pkgconfig ninja-build flex flex-devel zlib-devel zlib-static", "DIR_INSTALL=/usr/local bash bin/build-manylinux.sh" ] [tool.cibuildwheel.macos] before-all = [ - "brew install cmake ninja flex bison zlib google-benchmark", + "brew install cmake ninja flex bison zlib google-benchmark googletest", "bash bin/build-macos-universal.sh" ] before-test = [ @@ -82,6 +82,6 @@ before-test = [ [[tool.cibuildwheel.overrides]] select = "*-musllinux*" before-all = [ - "apk add --update gdb curl pkgconfig ninja flex flex-dev zlib-dev openssl-dev", + "apk add --update gdb curl pkgconfig ninja flex flex-dev zlib-dev", "DIR_INSTALL=/usr/local bash bin/build-manylinux.sh" ]