ci: use setup-cz

woile · woile · commit 97fb356d59a3 · 2026-04-07T06:57:00.000+01:00
diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml
@@ -10,20 +10,38 @@ jobs:
     if: ${{ github.repository == 'commitizen-tools/commitizen' && !startsWith(github.event.head_commit.message, 'bump:') }}
     runs-on: ubuntu-latest
     name: "Bump version and create changelog with commitizen"
+    permissions:
+      contents: write
+      actions: write
     steps:
       - name: Check out
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
-      - name: Create bump and changelog
-        uses: commitizen-tools/commitizen-action@master
-        with:
-          github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-          changelog_increment_filename: body.md
+          fetch-tags: true
+      - uses: commitizen-tools/setup-cz@main
+      - id: bump-version
+        run: |
+          cz bump --yes
+          git push --follow-tags
+          new_version="$(cz version -p)"
+          echo "new_version=$new_version" >> $GITHUB_OUTPUT
+          new_version_tag="$(cz version -p --tag)"
+          echo "new_version_tag=$new_version_tag" >> $GITHUB_OUTPUT
+      - name: Build changelog for Release
+        env:
+          NEW_VERSION: ${{ steps.bump-version.outputs.new_version }}
+        run: |
+          cz changelog --dry-run "${NEW_VERSION}" > .changelog.md
       - name: Release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: v${{ env.REVISION }}
-          bodyFile: "body.md"
-          skipIfReleaseExists: true
+        env:
+          GH_TOKEN: ${{ github.token }}
+          NEW_VERSION_TAG: ${{ steps.bump-version.outputs.new_version_tag }}
+        run: |
+          gh release create "${NEW_VERSION_TAG}" --notes-file .changelog.md
+      - name: trigger other workflow
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh workflow run pythonpublish.yml \
+            -f "version=${{ steps.bump-version.outputs.new_version_tag }}"
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -1,9 +1,20 @@
 name: Upload Python Package
 
+# With the current configuration this workflow will be
+# triggered via `workflow_dispatch` in `bumpversion.yml`.
+# We leave the `push.tags` trigger to allow for manual releases
+# in case we need to bump locally, and we actively push the tag.
+# The PERSONAL_ACCESS_TOKEN is no longer needed as we use the OIDC token instead.
+# We favor this approach because it requires less steps to set up and is more secure.
 on:
   push:
     tags:
       - "v*"
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to trigger"
+        required: true
 
 jobs:
   deploy:
@@ -15,8 +26,8 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
           fetch-depth: 0
+          ref: ${{ inputs.version || github.ref_name }}
       - name: Set up Python
         uses: astral-sh/setup-uv@v7
       - name: Build
diff --git a/docs/config/option.md b/docs/config/option.md
@@ -22,7 +22,7 @@ Required if you use `version_provider = "commitizen"`.
 - Type: `str`
 - Default: `None`
 
- Example: `"0.1.2"`.
+Example: `"0.1.2"`.
 
 ## `style`
 
diff --git a/docs/tutorials/github_actions.md b/docs/tutorials/github_actions.md
@@ -2,6 +2,9 @@
 
 This guide shows you how to automatically bump versions, create changelogs, and publish releases using Commitizen in GitHub Actions.
 
+!!! tip
+    Check the new [setup-cz](https://github.com/marketplace/actions/setup-commitizen-cli) action, simple and with [examples](https://github.com/commitizen-tools/setup-cz/tree/main/examples)
+
 ### Prerequisites
 
 Before setting up the workflow, you'll need:
diff --git a/pyproject.toml b/pyproject.toml
@@ -145,7 +145,7 @@ version_files = [
 ]
 version_provider = "uv"
 version_scheme = "pep440"
-
+annotated_tag = true
 
 [tool.uv.build-backend]
 module-name = "commitizen"

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ version_files = [`
`145`	`145`	`]`
`146`	`146`	`version_provider = "uv"`
`147`	`147`	`version_scheme = "pep440"`
`148`		`-`
	`148`	`+annotated_tag = true`
`149`	`149`
`150`	`150`	`[tool.uv.build-backend]`
`151`	`151`	`module-name = "commitizen"`