From a4df67f9f9b502e8f31312e188e47c5a23d9a6c1 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Fri, 4 Aug 2023 16:49:55 -0500 Subject: [PATCH] Attempt to fix building proper x.y.z versions by respecting tag version-x.y.z as one that shouldn't edit the pom --- .circleci/adjust-pom-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/adjust-pom-version.sh b/.circleci/adjust-pom-version.sh index 054fbdf2..1344b019 100755 --- a/.circleci/adjust-pom-version.sh +++ b/.circleci/adjust-pom-version.sh @@ -5,8 +5,8 @@ if [ -z "$CIRCLE_BRANCH" ] && [ -z "$CIRCLE_TAG" ]; then exit 1; fi -if [ "$CIRCLE_BRANCH" == "dev" ] || [ "$CIRCLE_BRANCH" == "staging" ] || [ "$CIRCLE_BRANCH" == "main" ]; then - echo "On a primary branch [$CIRCLE_BRANCH] - will not edit the pom version."; +if [ "$CIRCLE_BRANCH" == "dev" ] || [ "$CIRCLE_BRANCH" == "staging" ] || [ "$CIRCLE_BRANCH" == "main" ] || [ \! -z $(echo "$CIRCLE_TAG" | grep "^version-") ]; then + echo "On a primary branch or tag [${CIRCLE_BRANCH}${CIRCLE_TAG}] - will not edit the pom version."; exit 0; fi