From 7d1a7a9b89eadaafd17e45b73584d0f900266430 Mon Sep 17 00:00:00 2001 From: adongare Date: Tue, 13 Feb 2024 18:15:28 -0500 Subject: [PATCH] MAT-6378 whitelist some automatic merge messages --- .github/workflows/commit_message_validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/commit_message_validation.yml b/.github/workflows/commit_message_validation.yml index 83f6997..bc94b8e 100644 --- a/.github/workflows/commit_message_validation.yml +++ b/.github/workflows/commit_message_validation.yml @@ -23,7 +23,7 @@ jobs: BASE_BRANCH=${{ github.event.pull_request.base.ref }} msg_regex='MAT-[0-9]+\s.*' # This list permits some commits - commit_static_permit_list="(^Merge pull request \#)|(^Merge branch)|(^Revert \")" + commit_static_permit_list="(^Merge pull request \#)|(^Merge remote-tracking branch \#)|(^Merge branch)|(^Revert \")" # Initialize invalidCommit as false, will be set to true by any invalid commits invalidCommit=false CURRENT_BRANCH=$(git branch | grep ^\* | cut -d "*" -f 2 | cut -d " " -f 2)