From 7e4ce40a8e6e8f591c554fed0625707029189c0f Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 24 Aug 2026 15:29:33 -0700 Subject: [PATCH 1/7] fix: more typo really wish I could test this locally. --- .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 10e6bcd..7b8cd77 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ on: jobs: release-build: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success'}} && !startsWith({{ github.event.ref_name }}, "doc/") + if: ${{ github.event.workflow_run.conclusion == 'success'}} && !startsWith(${{ github.event.ref_name }}, "doc/") steps: - uses: actions/checkout@v7 - uses: actions/setup-python@v7 From 6ead586db7a3ff3bcbbe20336033d89fb4689d4e Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 24 Aug 2026 16:07:27 -0700 Subject: [PATCH 2/7] chore: more debug --- .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 55c1681..289721e 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ on: jobs: release-build: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' && !startsWith(${{ github.event.ref_name }}, "doc/") }} + if: $github.event.workflow_run.conclusion == 'success' && !startsWith($github.event.ref_name, "doc/") steps: - uses: actions/checkout@v7 - uses: actions/setup-python@v7 From 1cee4b824545a2c1c1af70b50cd1cfa195029e77 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 24 Aug 2026 16:15:46 -0700 Subject: [PATCH 3/7] more ga typo --- .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 289721e..c3a39cb 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ on: jobs: release-build: runs-on: ubuntu-latest - if: $github.event.workflow_run.conclusion == 'success' && !startsWith($github.event.ref_name, "doc/") + if: ${{ github.event.workflow_run.conclusion == 'success' && !startsWith(github.ref_name, "docs?/") }} steps: - uses: actions/checkout@v7 - uses: actions/setup-python@v7 From 6b7b5723f42bb68aabb58ec3b36654d4fdf9fc25 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 24 Aug 2026 16:21:36 -0700 Subject: [PATCH 4/7] f single quote --- .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 c3a39cb..2b41017 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ on: jobs: release-build: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' && !startsWith(github.ref_name, "docs?/") }} + if: ${{ github.event.workflow_run.conclusion == 'success' && !startsWith(github.ref_name, 'docs?/') }} steps: - uses: actions/checkout@v7 - uses: actions/setup-python@v7 From 16be4df2a33ddd7d00a88173ab3d0f50520395aa Mon Sep 17 00:00:00 2001 From: jrconlin Date: Tue, 25 Aug 2026 10:49:36 -0700 Subject: [PATCH 5/7] chore: fix dist name --- .github/workflows/python-package.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 2b41017..a43d042 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -32,7 +32,8 @@ jobs: - name: Upload distributions uses: actions/upload-artifact@v4 with: - name: release-dists + # Name of the distribution (no idea why they don't make this clear) + name: pywebpush path: dist/ pypi-publish: @@ -56,7 +57,8 @@ jobs: - name: Retrieve release distributions uses: actions/download-artifact@v8 with: - name: release-dists + # Name of the distribution (no idea why they don't make this clear) + name: pywebpush path: dist/ - name: validate build run: | From a8840b1bed32d3f6f52c6e5815f04f63951e91e9 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Tue, 25 Aug 2026 13:43:33 -0700 Subject: [PATCH 6/7] chore: more specific paths --- .github/workflows/python-package.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index a43d042..6f5d5cb 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -30,11 +30,12 @@ jobs: python -m build - name: Upload distributions + # Make sure the artifact versions match uses: actions/upload-artifact@v4 with: # Name of the distribution (no idea why they don't make this clear) name: pywebpush - path: dist/ + path: dist/*.tar.gz pypi-publish: # Remember, matching strings need to be in single quotes. @@ -55,7 +56,8 @@ jobs: steps: - name: Retrieve release distributions - uses: actions/download-artifact@v8 + # Make sure the artifact versions match + uses: actions/download-artifact@v4 with: # Name of the distribution (no idea why they don't make this clear) name: pywebpush @@ -65,6 +67,6 @@ jobs: ls -aFl dist/ - name: Publish release distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: dist/ - verbose: true + #with: + # packages-dir: dist/ + # verbose: true From fa8bed47be293a5cd96db9964fc904e55f088817 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Tue, 25 Aug 2026 15:41:11 -0700 Subject: [PATCH 7/7] chore: match to playground --- .github/workflows/python-package.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6f5d5cb..277ec1c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -2,6 +2,7 @@ # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python name: Python package +run-name: Package and Publish on: workflow_run: @@ -35,29 +36,27 @@ jobs: with: # Name of the distribution (no idea why they don't make this clear) name: pywebpush - path: dist/*.tar.gz + path: dist/ pypi-publish: # Remember, matching strings need to be in single quotes. - runs-on: ubuntu-latest + needs: + - release-build permissions: # IMPORTANT: this permission is mandatory for trusted publishing id-token: write + runs-on: ubuntu-latest # Dedicated environments with protections for publishing are strongly recommended. # For more information, see: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#deployment-protection-rules environment: name: pypi-publish # OPTIONAL: uncomment and update to include your PyPI project URL in the deployment status: url: https://pypi.org/p/pywebpush - # - # ALTERNATIVE: if your GitHub Release name is the PyPI project version string - # ALTERNATIVE: exactly, uncomment the following line instead: - # url: https://pypi.org/project/YOURPROJECT/${{ github.event.release.name }} steps: - - name: Retrieve release distributions + - name: Pull release distributions # Make sure the artifact versions match - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: # Name of the distribution (no idea why they don't make this clear) name: pywebpush @@ -67,6 +66,6 @@ jobs: ls -aFl dist/ - name: Publish release distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - #with: - # packages-dir: dist/ - # verbose: true + with: + packages-dir: dist/ + verbose: true