ci: rationalise workflows

Author: rjw57

.github/workflows/main.yml

@@ -1,39 +1,16 @@
+name: Main
+
 on:
   push:
 
 jobs:
   test:
     name: Run tests
-    uses: ./.github/workflows/tests-template.yml
+    uses: ./.github/workflows/tests.yml
   release:
-    name: Create release
-    if: ${{ github.ref == 'refs/heads/main' }}
-    runs-on: ubuntu-24.04
+    name: Release
+    uses: ./.github/workflows/release.yml
+    if: github.ref == 'refs/heads/main'
     permissions:
-      # Required to allow release-it to create releases
       contents: write
-    needs: [test]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - name: Install poetry
-        uses: abatilo/actions-poetry@v3
-      - name: Configure git
-        run: |
-          git config user.name "${GITHUB_ACTOR}"
-          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-      - name: Create release
-        run: npx -p @release-it/bumper -p @release-it/conventional-changelog release-it
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload artifacts for publication
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-dist
-          path: dist/*
+      id-token: write

.github/workflows/pypi-template.yml

@@ -1,22 +1,34 @@
-name: Publish Release to PyPI
+name: PyPI
 
 on:
-  release:
-    types: [published]
+  workflow_call:
+    inputs:
+      environment-name:
+        required: true
+        type: string
+      environment-url:
+        required: true
+        type: string
+      repository-url:
+        required: true
+        type: string
 
 jobs:
-  test-pypi-publish:
-    name: Publish to Test PyPI
-    uses: ./.github/workflows/pypi-template.yml
-    with:
-      environment-name: test-pypi
-      environment-url: https://test.pypi.org/p/pydantic-gitlab-webhooks
-      repository-url: https://test.pypi.org/legacy/
-  pypi-publish:
-    name: Publish to PyPI
-    needs: [test-pypi-publish]
-    uses: ./.github/workflows/pypi-template.yml
-    with:
-      environment-name: pypi
-      environment-url: https://pypi.org/p/pydantic-gitlab-webhooks
-      repository-url: https://pypi.org/legacy/
+  publish:
+    name: Publish PyPI package
+    runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
+    environment:
+      name: ${{ inputs.environment-name }}
+      url: ${{ inputs.environment-url }}
+    steps:
+      - name: Download assets
+        uses: robinraju/release-downloader@v1
+        with:
+          tag: "${{ github.tag }}"
+          out-file-path: dist/
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: ${{ inputs.repository-url }}

.github/workflows/pypi.yml

@@ -0,0 +1,55 @@
+name: Publish release
+
+on:
+  workflow_call:
+
+jobs:
+  release:
+    name: Create
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Install poetry
+        uses: abatilo/actions-poetry@v3
+      - name: Configure git
+        run: |
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+      - name: Create release
+        run: npx -p @release-it/bumper -p @release-it/conventional-changelog release-it
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload artifacts for publication
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-dist
+          path: dist/*
+  test-pypi-publish:
+    name: Publish to Test PyPI
+    uses: ./.github/workflows/pypi.yml
+    needs: [release]
+    permissions:
+      id-token: write
+    with:
+      environment-name: test-pypi
+      environment-url: https://test.pypi.org/p/pydantic-gitlab-webhooks
+      repository-url: https://test.pypi.org/legacy/
+  pypi-publish:
+    name: Publish to PyPI
+    needs: [test-pypi-publish]
+    permissions:
+      id-token: write
+    uses: ./.github/workflows/pypi.yml
+    with:
+      environment-name: pypi
+      environment-url: https://pypi.org/p/pydantic-gitlab-webhooks
+      repository-url: https://pypi.org/legacy/