From a58efc3910bc71bb4034817e1d090a16875d8f52 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Thu, 30 Jan 2025 10:44:54 -0800 Subject: [PATCH 1/5] Bumped upload-artifact action from v3 to v4 Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 54a255517f..3439c52f23 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -193,7 +193,7 @@ jobs: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./wheelhouse/*.whl @@ -214,7 +214,7 @@ jobs: - name: Generate sdist run: python -m build -s . - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: sdist path: dist From 62bf6cad22408cd903ba9c3bdf1b2e81b01ddbe4 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Thu, 30 Jan 2025 11:20:11 -0800 Subject: [PATCH 2/5] attempting to disambigua te upload artifact Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 3439c52f23..af267a1ea0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -196,7 +196,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: wheels - path: ./wheelhouse/*.whl + path: ./wheelhouse/*-${{ matrix.python-build }}.whl package_sdist: needs: py_build_test From c57e11536a32b7066429cb632948d89fbeb21fee Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Thu, 30 Jan 2025 11:45:40 -0800 Subject: [PATCH 3/5] Each wheel artifact in the matrix has a unique name rather than using deprecated implicit merge behavior available in v3 upload artifact. Updated pypi publish to match new artifact name pattern Signed-off-by: Eric Reinecke --- .github/workflows/pypi-publish.yml | 3 ++- .github/workflows/python-package.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 8b130aa6de..29968216e9 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -22,7 +22,8 @@ jobs: workflow: python-package.yml workflow_conclusion: success commit: ${{ github.sha }} - name: wheels + name_is_regexp: true + name: wheel-.* path: dist - name: Download sdist from commit ${{ github.sha }} diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index af267a1ea0..22af754afe 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -195,8 +195,8 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: wheels - path: ./wheelhouse/*-${{ matrix.python-build }}.whl + name: wheel-{{ matrix.os }}-${{ matrix.python-build }} + path: ./wheelhouse/*.whl package_sdist: needs: py_build_test From 7a6b1108b57b7faf7734c4645b443d62e377e441 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Thu, 30 Jan 2025 12:02:25 -0800 Subject: [PATCH 4/5] I accidentally a dollar sign Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 22af754afe..fda3721553 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -195,7 +195,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: wheel-{{ matrix.os }}-${{ matrix.python-build }} + name: wheel-${{ matrix.os }}-${{ matrix.python-build }} path: ./wheelhouse/*.whl package_sdist: From 9c3cd990c22e3d5203e55800151b554fce8dd91a Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Thu, 30 Jan 2025 12:04:21 -0800 Subject: [PATCH 5/5] Removed star from python-build matrix variable so it can be used in artifact names Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index fda3721553..446a7b192c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -172,9 +172,9 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-13, macos-latest] - python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*'] + python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312'] exclude: - - { os: macos-latest, python-build: 'cp37*' } + - { os: macos-latest, python-build: 'cp37' } steps: - uses: actions/checkout@v4 @@ -187,7 +187,7 @@ jobs: with: output-dir: wheelhouse env: - CIBW_BUILD: ${{ matrix.python-build }} + CIBW_BUILD: ${{ matrix.python-build }}* CIBW_SKIP: '*musllinux*' CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014