chore(ci): adapt release workflow and config for v8

nejch · nejch · commit 827fefeeb7bf · 2023-08-29T11:01:30.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,7 @@ jobs:
   release:
     if: github.repository == 'python-gitlab/python-gitlab'
     runs-on: ubuntu-latest
+    concurrency: release
     permissions:
       id-token: write
     environment: pypi.org
@@ -17,19 +18,21 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
-    - name: mint API token
-      id: mint-token
-      run: |
-        resp=$(curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=pypi")
-        oidc_token=$(jq '.value' <<< "${resp}")
 
-        resp=$(curl -X POST https://pypi.org/_/oidc/github/mint-token -d "{\"token\":${oidc_token}}")
-        api_token=$(jq '.token' <<< "${resp}" | tr -d '"')
-
-        echo "::add-mask::${api_token}"
-        echo "api-token=${api_token}" >> "${GITHUB_OUTPUT}"
     - name: Python Semantic Release
-      uses: relekang/python-semantic-release@v8.0.8
+      uses: python-semantic-release/python-semantic-release@v8.0.8
       with:
         github_token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
-        pypi_token: ${{ steps.mint-token.outputs.api-token }}
+
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      # NOTE: DO NOT wrap the conditional in ${{ }} as it will always evaluate to true.
+      # See https://github.com/actions/runner/issues/1173
+      if: steps.release.outputs.released == 'true'
+
+    - name: Publish package distributions to GitHub Releases
+      # TODO: track tags after https://github.com/python-semantic-release/upload-to-gh-release/issues/2
+      uses: python-semantic-release/upload-to-gh-release@0f96c02a48278aff14251e9f1a0d73122a8c638b
+      if: steps.release.outputs.released == 'true'
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,9 @@ disable_error_code = ["no-untyped-def"]
 
 [tool.semantic_release]
 branch = "main"
-version_variable = "gitlab/_version.py:__version__"
+version_variables = [
+    "gitlab/_version.py:__version__",
+]
 commit_subject = "chore: release v{version}"
 commit_message = ""
 
