diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml deleted file mode 100644 index 77d1e72a3..000000000 --- a/.github/workflows/release-check.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Publish to Test PyPI - -on: - workflow_call: - inputs: - ref: - required: true - type: string - -jobs: - pypi-test: - runs-on: ubuntu-latest - environment: release - permissions: - id-token: write - steps: - - uses: actions/checkout@v4 - with: - ref: ${{ inputs.ref }} - - - name: Install uv - uses: astral-sh/setup-uv@v5 - with: - python-version: "3.11" - - - name: Build - run: uv build - - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/release-on-merge.yml b/.github/workflows/release-on-merge.yml index 2525e447c..2cacf86c9 100644 --- a/.github/workflows/release-on-merge.yml +++ b/.github/workflows/release-on-merge.yml @@ -59,22 +59,52 @@ jobs: # --------------------------------------------------------------------------- pypi-test: needs: release + runs-on: ubuntu-latest + environment: release permissions: id-token: write - uses: ./.github/workflows/release-check.yml - with: - ref: ${{ github.sha }} + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + + - name: Install uv + uses: astral-sh/setup-uv@v5 + with: + python-version: "3.11" + + - name: Build + run: uv build + + - name: Publish to Test PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ # --------------------------------------------------------------------------- # Publish to PyPI # --------------------------------------------------------------------------- pypi: needs: pypi-test + runs-on: ubuntu-latest + environment: release permissions: id-token: write - uses: ./.github/workflows/release.yml - with: - ref: ${{ github.sha }} + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + + - name: Install uv + uses: astral-sh/setup-uv@v5 + with: + python-version: "3.11" + + - name: Build + run: uv build + + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 # --------------------------------------------------------------------------- # Prepare the next release branch (version bump + lock + PR) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 249824870..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Publish to PyPI - -on: - workflow_call: - inputs: - ref: - required: true - type: string - -jobs: - pypi: - runs-on: ubuntu-latest - environment: release - permissions: - id-token: write - steps: - - uses: actions/checkout@v4 - with: - ref: ${{ inputs.ref }} - - - name: Install uv - uses: astral-sh/setup-uv@v5 - with: - python-version: "3.11" - - - name: Build - run: uv build - - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1