From f33d1d8a72d1a298ba028e0a1e94b94b52d5e2b2 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Wed, 15 Nov 2023 14:33:11 +0100 Subject: [PATCH] chore: support merge commits as well --- .github/workflows/check_commits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_commits.yml b/.github/workflows/check_commits.yml index 216d100..fa1d81b 100644 --- a/.github/workflows/check_commits.yml +++ b/.github/workflows/check_commits.yml @@ -24,7 +24,7 @@ jobs: uses: tim-actions/commit-message-checker-with-regex@v0.3.1 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/changed-files@v35.5.6