ci: also ignore merge commits

papanito · Dec 4, 2021 · 4be5696 · 4be5696
1 parent 294ddc5
commit 4be5696
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,10 +40,10 @@ jobs:
       - name: Set current version
         run: echo $RELEASE_VERSION > ./VERSION
       - name: Create changelog
-        run: auto-changelog --ignore-commit-pattern "\[?ci|docu|meta\]?|fixup" --release-summary 
+        run: auto-changelog --ignore-commit-pattern "\[?ci|docu|Merge|meta\]?|fixup" --release-summary 
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: "[meta] Update changelog, bump version"
+          commit_message: "meta: Update changelog, bump version"
           file_pattern: ./VERSION ./CHANGELOG.md
           commit_user_name: My GitHub Actions Bot
           commit_user_email: [email protected]