From cddcc579b0754e203b84cb340122d5ca6be1a3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Borgna?= <121866228+aborgna-q@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:17:33 +0100 Subject: [PATCH] ci: update python-wheels job from maturin 1.6 (#433) Re-runs `maturin generate-ci` to update the wheels job. It had some changes to how it chooses the python interpreter, and adds `musllinux` targets. --- .github/workflows/python-wheels.yml | 45 ++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml index 3ba5b882..4b31fe5d 100644 --- a/.github/workflows/python-wheels.yml +++ b/.github/workflows/python-wheels.yml @@ -1,5 +1,5 @@ # This file is based on the version -# autogenerated by maturin v1.5.1 +# autogenerated by maturin v1.6.0 # # To recreate it, run: # @@ -42,12 +42,12 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: 3.x - name: Build wheels uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist -i python3.10 + args: --release --out dist --find-interpreter sccache: 'true' manylinux: auto - name: Upload wheels @@ -56,6 +56,37 @@ jobs: name: wheels-linux-${{ matrix.platform.target }} path: dist + musllinux: + runs-on: ${{ matrix.platform.runner }} + strategy: + matrix: + platform: + - runner: ubuntu-latest + target: x86_64 + - runner: ubuntu-latest + target: x86 + - runner: ubuntu-latest + target: aarch64 + - runner: ubuntu-latest + target: armv7 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.x + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.platform.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + manylinux: musllinux_1_2 + - name: Upload wheels + uses: actions/upload-artifact@v4 + with: + name: wheels-musllinux-${{ matrix.platform.target }} + path: dist + windows: runs-on: ${{ matrix.platform.runner }} strategy: @@ -69,7 +100,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: 3.x architecture: ${{ matrix.platform.target }} - name: Build wheels uses: PyO3/maturin-action@v1 @@ -88,7 +119,7 @@ jobs: strategy: matrix: platform: - - runner: macos-latest + - runner: macos-12 target: x86_64 - runner: macos-14 target: aarch64 @@ -96,7 +127,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: 3.x - name: Build wheels uses: PyO3/maturin-action@v1 with: @@ -128,7 +159,7 @@ jobs: name: Release runs-on: ubuntu-latest if: ${{ (github.event_name == 'release' && github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket2-py-v') ) || (github.event_name == 'workflow_dispatch' && github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/tket2-py-v') ) }} - needs: [linux, windows, macos, sdist] + needs: [linux, musllinux, windows, macos, sdist] steps: - uses: actions/download-artifact@v4 - name: Publish to PyPI