From b36a606ee686cd725913e0b6a7776ed1c522b04a Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Wed, 6 Jul 2022 06:40:36 -0300 Subject: [PATCH 1/2] feat: adding custom commit pattern option --- scripts/bb-validate-commits.sh | 11 +++++++++++ scripts/bb-validate-hotfix.sh | 4 +--- scripts/bb-validate-release.sh | 3 +-- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 scripts/bb-validate-commits.sh diff --git a/scripts/bb-validate-commits.sh b/scripts/bb-validate-commits.sh new file mode 100644 index 0000000..2706f9a --- /dev/null +++ b/scripts/bb-validate-commits.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +echo '{"user":"'$(echo $BB_TOKEN_BASIC_AUTH | sed -rn 's/:.+//p')'","password":"'$(echo $BB_TOKEN_BASIC_AUTH | sed -rn 's/.+://p')'","workspace":"'$BITBUCKET_REPO_OWNER'"}' > bitbucket-ext.json +COMMIT_PATTERN=$(npx bitbucket-ext get-project-info $BITBUCKET_REPO_SLUG | jq .description | sed -rn 's/COMMIT_PATTERN: (.+)/\1/p' | sed -e 's/^"//' -e 's/"$//' || echo) +if [[ $COMMIT_PATTERN = '' ]]; then + COMMIT_PATTERN='(fix|feat|perf|revert):' +fi +rm -rf bitbucket-ext.json +COMMITS=$(if [[ $(git log $BITBUCKET_PR_DESTINATION_BRANCH.. | grep -E $COMMIT_PATTERN) = '' ]]; then echo 0; else echo 1; fi) + +if [[ $COMMITS = '0' ]]; then echo 'No changes were found! Pattern '$COMMIT_PATTERN; exit 1; fi \ No newline at end of file diff --git a/scripts/bb-validate-hotfix.sh b/scripts/bb-validate-hotfix.sh index 96e9faa..394a1f6 100644 --- a/scripts/bb-validate-hotfix.sh +++ b/scripts/bb-validate-hotfix.sh @@ -2,9 +2,7 @@ echo Validating commit against $BITBUCKET_PR_DESTINATION_BRANCH git fetch origin $BITBUCKET_PR_DESTINATION_BRANCH:$BITBUCKET_PR_DESTINATION_BRANCH -COMMITS=$(if [[ $(git log $BITBUCKET_PR_DESTINATION_BRANCH.. | grep -E '(fix|feat|perf|revert):') = '' ]]; then echo 0; else echo 1; fi) - -if [[ $COMMITS = '0' ]]; then echo 'No changes were found!'; exit 1; fi +. ./scripts/bb-validate-commits.sh CHANGELOG=$(if [[ $(git diff $BITBUCKET_PR_DESTINATION_BRANCH.. --stat | grep -E 'CHANGELOG.+\|') = '' ]]; then echo 0; else echo 1; fi) diff --git a/scripts/bb-validate-release.sh b/scripts/bb-validate-release.sh index 5099806..b5e66d2 100644 --- a/scripts/bb-validate-release.sh +++ b/scripts/bb-validate-release.sh @@ -4,8 +4,7 @@ echo Validating commit against $BITBUCKET_PR_DESTINATION_BRANCH git fetch origin $BITBUCKET_PR_DESTINATION_BRANCH:$BITBUCKET_PR_DESTINATION_BRANCH if [[ $BITBUCKET_PR_DESTINATION_BRANCH = master ]]; then - COMMITS=$(if [[ $(git log $BITBUCKET_PR_DESTINATION_BRANCH.. | grep -E '(fix|feat|perf|revert):') = '' ]]; then echo 0; else echo 1; fi) - if [[ $COMMITS = '0' ]]; then echo 'No changes were found!'; exit 1; fi + . ./scripts/bb-validate-commits.sh fi CHANGELOG=$(if [[ $(git diff $BITBUCKET_PR_DESTINATION_BRANCH.. --stat | grep -E 'CHANGELOG.+\|') = '' ]]; then echo 0; else echo 1; fi) From 5fbfff15b40a755469bc0943787aecd121c0365f Mon Sep 17 00:00:00 2001 From: Thiago Oliveira Santos Date: Wed, 6 Jul 2022 06:49:58 -0300 Subject: [PATCH 2/2] Update scripts/bb-validate-commits.sh --- scripts/bb-validate-commits.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bb-validate-commits.sh b/scripts/bb-validate-commits.sh index 2706f9a..baedd22 100644 --- a/scripts/bb-validate-commits.sh +++ b/scripts/bb-validate-commits.sh @@ -8,4 +8,4 @@ fi rm -rf bitbucket-ext.json COMMITS=$(if [[ $(git log $BITBUCKET_PR_DESTINATION_BRANCH.. | grep -E $COMMIT_PATTERN) = '' ]]; then echo 0; else echo 1; fi) -if [[ $COMMITS = '0' ]]; then echo 'No changes were found! Pattern '$COMMIT_PATTERN; exit 1; fi \ No newline at end of file +if [[ $COMMITS = '0' ]]; then echo 'No changes were found! Pattern '$COMMIT_PATTERN; exit 1; fi