diff --git a/projects/clr/.github/workflows/pr-title-validate.yml b/projects/clr/.github/workflows/pr-title-validate.yml index c6ffbd28b2..caf49ee6aa 100644 --- a/projects/clr/.github/workflows/pr-title-validate.yml +++ b/projects/clr/.github/workflows/pr-title-validate.yml @@ -35,8 +35,12 @@ jobs: echo "$COMMITS" echo "$COMMITS" | while read -r hash message; do echo -e "$hash $message\n " - if [[ ! "$message" =~ ^SWDEV-[0-9]+ ]]; then - echo "::error:: $hash commit should start with Jira ticket ID, SWDEV-" + if [[ "$message" =~ ^SWDEV-[0-9]+ ]]; then + echo "Valid JIRA ticket format" + elif [[ "$message" =~ ^Merge\ branch ]]; then + echo "Merge commits are allowed" + else + echo "::error:: $hash commit should start with Jira ticket ID, SWDEV- or be a merge commit" exit 1 fi done