From 827a26f35914839e759e4ece2c90747152db1cc6 Mon Sep 17 00:00:00 2001 From: Maximilian Linhoff Date: Tue, 16 Jul 2024 12:13:28 +0200 Subject: [PATCH 1/3] Update CI config to also build apple-silicon wheels --- .github/workflows/deploy.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aa69a75..051a45f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,6 +4,7 @@ on: push: tags: - 'v*' + pull_request: jobs: build_wheels: @@ -11,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macOS-11] + os: [ubuntu-20.04, windows-2019, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -33,7 +34,7 @@ jobs: # these shouldn't be needed CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux*" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./dist/*.whl name: wheels @@ -47,9 +48,9 @@ jobs: fetch-tags: true - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.12" - name: Build sdist run: | @@ -57,12 +58,13 @@ jobs: pip install -U build python -m build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./dist/*.tar.gz name: sdist pypi_upload: + if: startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-latest needs: - build_wheels From 248a815f3c3b5a7ebe553133bc4f2eba0cbeab5a Mon Sep 17 00:00:00 2001 From: Maximilian Linhoff Date: Tue, 16 Jul 2024 12:24:18 +0200 Subject: [PATCH 2/3] Unique name for artifact --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 051a45f..b02df38 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/upload-artifact@v4 with: path: ./dist/*.whl - name: wheels + name: wheels-${{ matrix.os }} build_sdist: runs-on: ubuntu-latest From b23916d52b0c93b6a2d7ef893690a338195d0b3d Mon Sep 17 00:00:00 2001 From: Maximilian Linhoff Date: Tue, 16 Jul 2024 12:30:28 +0200 Subject: [PATCH 3/3] Use {ubuntu,windows}-latest for building wheels --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b02df38..c918cc4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-13, macos-14] + os: [ubuntu-latest, windows-latest, macos-13, macos-14] steps: - uses: actions/checkout@v4