From 1209f124152294cc2ed0f18eba085954c6fac1d3 Mon Sep 17 00:00:00 2001 From: Aaron Shaw Date: Mon, 10 Apr 2023 16:43:34 +0100 Subject: [PATCH] wheels: add arm64 builds and bump action versions - add arm64, ppc64le, s390x builds via qemu - add macos universal2 build - add windows arm64 build - bump cancel workflow action to latest to remove nodejs warnings - bump cibuildwheel action to latest Signed-off-by: Aaron Shaw --- .github/workflows/build.yml | 22 ++++++++++++++++------ pyproject.toml | 3 +-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb6996daa0..31e02f954a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,7 @@ # * https://github.com/actions/upload-artifact # * https://github.com/marketplace/actions/cancel-workflow-action # * https://github.com/vmactions/freebsd-vm +# * https://github.com/marketplace/actions/docker-setup-qemu on: [push, pull_request] name: build @@ -30,17 +31,19 @@ jobs: matrix: include: - os: ubuntu-latest - archs: "x86_64 i686" + archs: "x86_64 i686 aarch64 ppc64le s390x" - os: macos-12 - archs: "x86_64 arm64" + archs: "x86_64 arm64 universal2" - os: windows-2019 archs: "AMD64" + - os: windows-2019 + archs: "ARM64" - os: windows-2019 archs: "x86" steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 + uses: styfle/cancel-workflow-action@0.11.0 with: access_token: ${{ github.token }} @@ -48,11 +51,18 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.11 + + - name: Set up QEMU + if: matrix.os == 'ubuntu-latest' + uses: docker/setup-qemu-action@v2 + with: + platforms: all - name: Create wheels + run tests - uses: pypa/cibuildwheel@v2.11.2 + uses: pypa/cibuildwheel@v2.12.1 env: CIBW_ARCHS: "${{ matrix.archs }}" + CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x}" - name: Upload wheels uses: actions/upload-artifact@v3 @@ -85,7 +95,7 @@ jobs: steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 + uses: styfle/cancel-workflow-action@0.11.0 with: access_token: ${{ github.token }} @@ -115,7 +125,7 @@ jobs: runs-on: macos-12 steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 + uses: styfle/cancel-workflow-action@0.11.0 with: access_token: ${{ github.token }} diff --git a/pyproject.toml b/pyproject.toml index 8d68131c95..802fe8b5b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,7 +77,6 @@ requires = ["setuptools>=43", "wheel"] build-backend = "setuptools.build_meta" [tool.cibuildwheel] -skip = ["pp*", "*-musllinux*"] test-extras = "test" test-command = [ "env PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 PSUTIL_SCRIPTS_DIR={project}/scripts python {project}/psutil/tests/runner.py", @@ -85,4 +84,4 @@ test-command = [ ] [tool.cibuildwheel.macos] -archs = ["x86_64", "arm64"] +archs = ["x86_64", "arm64", "universal2"]