chore: support merge commits as well

dodevops · Nov 15, 2023 · f33d1d8 · f33d1d8
1 parent 30c16f1
commit f33d1d8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/check_commits.yml b/.github/workflows/check_commits.yml
@@ -24,7 +24,7 @@ jobs:
                 uses: tim-actions/[email protected]
                 with:
                     commits: ${{ steps.get-pr-commits.outputs.commits }}
-                    pattern: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)'
+                    pattern: '^(Merge branch ''main'' into develop)|(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)'
                     error: 'Commit messages do not follow https://www.conventionalcommits.org/en/v1.0.0/'
             -   name: Get Changed Files
                 uses: tj-actions/[email protected]