From c3681451df4a46f5d353b35df74bf52cf435fc5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:42:50 +0000 Subject: [PATCH 1/6] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pypi.yml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index d129c0c32a..c452ebbfaf 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -30,7 +30,7 @@ jobs: - name: Build SDist run: pipx run build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz @@ -51,7 +51,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.19.2 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb36a61386..dba9e6c50a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -187,7 +187,7 @@ jobs: FLOAT32: ${{ matrix.float32 }} - name: Upload coverage file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage path: coverage/coverage-${{ steps.matrix-id.outputs.id }}.xml From 89d416e02c13604de9dc4556941f58c0efaa0911 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Fri, 12 Jul 2024 14:25:59 +0200 Subject: [PATCH 2/6] Migrate pypi to GHA artifacts v4 --- .github/workflows/pypi.yml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index c452ebbfaf..8d32f059bc 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -32,6 +32,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: sdist path: dist/*.tar.gz build_wheels: @@ -53,6 +54,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheels path: ./wheelhouse/*.whl check_dist: @@ -60,10 +62,16 @@ jobs: needs: [make_sdist,build_wheels] runs-on: ubuntu-22.04 steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: artifact + name: sdist path: dist + + - uses: actions/download-artifact@v4 + with: + name: wheels + path: dist + - name: Check SDist run: | mkdir -p test-sdist @@ -83,12 +91,17 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'release' && github.event.action == 'published' steps: - - uses: actions/download-artifact@v3 - with: - name: artifact - path: dist + - uses: actions/download-artifact@v4 + with: + name: sdist + path: dist - - uses: pypa/gh-action-pypi-publish@v1.9.0 - with: - user: __token__ - password: ${{ secrets.pypi_password }} + - uses: actions/download-artifact@v4 + with: + name: wheels + path: dist + + - uses: pypa/gh-action-pypi-publish@v1.9.0 + with: + user: __token__ + password: ${{ secrets.pypi_password }} From 72e108cec004198be4ea92f8a86aa255990c5f89 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Fri, 12 Jul 2024 14:31:48 +0200 Subject: [PATCH 3/6] Bump download-artifact to v4 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dba9e6c50a..953cd8b874 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -273,7 +273,7 @@ jobs: python -m pip install -U coverage>=5.1 coveralls - name: Download coverage file - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage path: coverage From eceb1ec36998d98f145a82277c57cc3d9caaa9a6 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Fri, 12 Jul 2024 14:54:22 +0200 Subject: [PATCH 4/6] Eliminate undefined matrix.python-version variable --- .github/workflows/pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 8d32f059bc..d0f3b91873 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -36,7 +36,7 @@ jobs: path: dist/*.tar.gz build_wheels: - name: Build ${{ matrix.python-version }} wheels on ${{ matrix.platform }} + name: Build wheels for ${{ matrix.platform }} runs-on: ${{ matrix.platform }} strategy: matrix: From 2353d2b509dbfc31e662805421f8621086c69d1f Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Fri, 12 Jul 2024 14:56:39 +0200 Subject: [PATCH 5/6] Upload/download each platform separately --- .github/workflows/pypi.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index d0f3b91873..8f95bfa4df 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.platform }} path: ./wheelhouse/*.whl check_dist: @@ -69,9 +69,19 @@ jobs: - uses: actions/download-artifact@v4 with: - name: wheels + name: wheels-macos-12 path: dist + - uses: actions/download-artifact@v4 + with: + name: wheels-windows-2022 + path: dist + + - uses: actions/download-artifact@v4 + with: + name: wheels-ubuntu-20.04 + path: dist + - name: Check SDist run: | mkdir -p test-sdist @@ -98,7 +108,17 @@ jobs: - uses: actions/download-artifact@v4 with: - name: wheels + name: wheels-macos-12 + path: dist + + - uses: actions/download-artifact@v4 + with: + name: wheels-windows-2022 + path: dist + + - uses: actions/download-artifact@v4 + with: + name: wheels-ubuntu-20.04 path: dist - uses: pypa/gh-action-pypi-publish@v1.9.0 From 872605a3e96bd417db209c97f7d6c42424814f6f Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Thu, 18 Jul 2024 14:11:42 +0200 Subject: [PATCH 6/6] Use pattern arg to download-artifact --- .github/workflows/pypi.yml | 26 ++++---------------------- .github/workflows/test.yml | 5 +++-- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 8f95bfa4df..ca37e422d0 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -69,19 +69,10 @@ jobs: - uses: actions/download-artifact@v4 with: - name: wheels-macos-12 + pattern: wheels-* path: dist + merge-multiple: true - - uses: actions/download-artifact@v4 - with: - name: wheels-windows-2022 - path: dist - - - uses: actions/download-artifact@v4 - with: - name: wheels-ubuntu-20.04 - path: dist - - name: Check SDist run: | mkdir -p test-sdist @@ -108,18 +99,9 @@ jobs: - uses: actions/download-artifact@v4 with: - name: wheels-macos-12 - path: dist - - - uses: actions/download-artifact@v4 - with: - name: wheels-windows-2022 - path: dist - - - uses: actions/download-artifact@v4 - with: - name: wheels-ubuntu-20.04 + pattern: wheels-* path: dist + merge-multiple: true - uses: pypa/gh-action-pypi-publish@v1.9.0 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 953cd8b874..674bc52c7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -189,7 +189,7 @@ jobs: - name: Upload coverage file uses: actions/upload-artifact@v4 with: - name: coverage + name: coverage-${{ steps.matrix-id.outputs.id }} path: coverage/coverage-${{ steps.matrix-id.outputs.id }}.xml benchmarks: @@ -275,8 +275,9 @@ jobs: - name: Download coverage file uses: actions/download-artifact@v4 with: - name: coverage + pattern: coverage-* path: coverage + merge-multiple: true - name: Upload coverage to Codecov uses: codecov/codecov-action@v4