diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index bbb866a..326b009 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -4,10 +4,10 @@ name: Publish Python to PyPI -on: push -# push: -# branches: -# - main +on: + push: + branches: + - main jobs: build: @@ -34,81 +34,16 @@ jobs: name: python-package-distributions path: dist/ -# publish-to-pypi: -# name: >- -# Publish Python distribution to PyPI -# if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes -# needs: -# - build -# runs-on: ubuntu-latest -# environment: -# name: pypi -# url: https://pypi.org/p/tell -# permissions: -# id-token: write # IMPORTANT: mandatory for trusted publishing - -# steps: -# - name: Download all the dists -# uses: actions/download-artifact@v4 -# with: -# name: python-package-distributions -# path: dist/ -# - name: Publish distribution 📦 to PyPI -# uses: pypa/gh-action-pypi-publish@release/v1 - -# github-release: -# name: >- -# Sign the Python distribution with Sigstore -# and upload them to GitHub Release -# needs: -# - publish-to-pypi -# runs-on: ubuntu-latest - -# permissions: -# contents: write # IMPORTANT: mandatory for making GitHub Releases -# id-token: write # IMPORTANT: mandatory for sigstore - -# steps: -# - name: Download all the dists -# uses: actions/download-artifact@v4 -# with: -# name: python-package-distributions -# path: dist/ -# - name: Sign the dists with Sigstore -# uses: sigstore/gh-action-sigstore-python@v2.1.1 -# with: -# inputs: >- -# ./dist/*.tar.gz -# ./dist/*.whl -# - name: Create GitHub Release -# env: -# GITHUB_TOKEN: ${{ github.token }} -# run: >- -# gh release create -# '${{ github.ref_name }}' -# --repo '${{ github.repository }}' -# --notes "" -# - name: Upload artifact signatures to GitHub Release -# env: -# GITHUB_TOKEN: ${{ github.token }} -# # Upload to GitHub Release using the `gh` CLI. -# # `dist/` contains the built packages, and the -# # sigstore-produced signatures and certificates. -# run: >- -# gh release upload -# '${{ github.ref_name }}' dist/** -# --repo '${{ github.repository }}' - - publish-to-testpypi: - name: Publish to TestPyPI + publish-to-pypi: + name: >- + Publish Python distribution to PyPI + if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes needs: - build runs-on: ubuntu-latest - environment: - name: testpypi - url: https://test.pypi.org/p/tell - + name: pypi + url: https://pypi.org/p/tell permissions: id-token: write # IMPORTANT: mandatory for trusted publishing @@ -118,8 +53,76 @@ jobs: with: name: python-package-distributions path: dist/ - - name: Publish distribution to TestPyPI + - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + + github-release: + name: >- + Sign the Python distribution with Sigstore + and upload them to GitHub Release + needs: + - publish-to-pypi + runs-on: ubuntu-latest + + permissions: + contents: write # IMPORTANT: mandatory for making GitHub Releases + id-token: write # IMPORTANT: mandatory for sigstore + + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 with: - repository-url: https://test.pypi.org/legacy/ - verbose: true + name: python-package-distributions + path: dist/ + - name: Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@v2.1.1 + with: + inputs: >- + ./dist/*.tar.gz + ./dist/*.whl + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release create + '${{ github.ref_name }}' + --repo '${{ github.repository }}' + --notes "" + - name: Upload artifact signatures to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + # Upload to GitHub Release using the `gh` CLI. + # `dist/` contains the built packages, and the + # sigstore-produced signatures and certificates. + run: >- + gh release upload + '${{ github.ref_name }}' dist/** + --repo '${{ github.repository }}' + +# Note: not publishing to test.pypi.org because the name is too similar to another package +# https://github.com/pypi/warehouse/issues/17026 + + # publish-to-testpypi: + # name: Publish to TestPyPI + # needs: + # - build + # runs-on: ubuntu-latest + + # environment: + # name: testpypi + # url: https://test.pypi.org/p/tell + + # permissions: + # id-token: write # IMPORTANT: mandatory for trusted publishing + + # steps: + # - name: Download all the dists + # uses: actions/download-artifact@v4 + # with: + # name: python-package-distributions + # path: dist/ + # - name: Publish distribution to TestPyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # repository-url: https://test.pypi.org/legacy/ + # verbose: true