Merge pull request #2132 from kristof-mattei/better-changelog

feat: add the self-referencing commit too

Author: kristof-mattei

.github/workflows/release.yml

@@ -112,7 +112,15 @@ jobs:
           version=$(git-cliff --bumped-version --unreleased --github-token ${{ secrets.GITHUB_TOKEN }})
           echo "version=$version" >> ${GITHUB_OUTPUT}
 
-          git tag $version --message "chore(version): Release ${version}"
+          commit_message="chore(release): Release ${version}"
+
+          git-cliff --output CHANGELOG.md --bump --with-commit "${commit_message}" --github-token ${{ secrets.GITHUB_TOKEN }}
+
+          git add CHANGELOG.md
+
+          git commit --message "${commit_message}"
+
+          git tag $version --message "${commit_message}"
 
           git push --follow-tags
 
@@ -124,14 +132,3 @@ jobs:
           body_path: diff-CHANGELOG.md
           tag_name: ${{ steps.release.outputs.version }}
           token: ${{ secrets.TOKEN_TO_TRIGGER_SUBSEQUENT_WORKFLOWS }}
-
-      - name: Update changelog
-        shell: bash
-        run: |
-          git-cliff --output CHANGELOG.md --github-token ${{ secrets.GITHUB_TOKEN }}
-
-          git add CHANGELOG.md
-
-          git commit --message "chore(version): Publish changelog for ${{ steps.release.outputs.version }}"
-
-          git push