From bfd03ed9d005197e3ce4e464b304541e85c7b362 Mon Sep 17 00:00:00 2001 From: cschabert Date: Tue, 5 Apr 2022 09:18:16 +0200 Subject: [PATCH] verifiy version finding --- bamboo-specs/src/main/resources/scripts/build-java.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index 0e83e1d4a..7e0afba0d 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -5,13 +5,13 @@ SERVICE_NAME=$1 if [[ "$bamboo_planRepository_branchName" == "master" ]] then - branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') - latestVersion=$( semver $(git tag -l $branchVersion.*) | tail -n1) + branchVersion=$(cat pom.xml | grep -Eo " .*-SNAPSHOT" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|' | tr -d ' ') + latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 ) newVersion="$(semver $latestVersion -p -i minor)" elif [[ "$bamboo_planRepository_branchName" == release* ]] then branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|') - latestVersion=$( semver $(git tag -l $branchVersion.*) | tail -n1) + latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 ) newVersion="$(semver $latestVersion -p -i patch)" elif [[ "${bamboo_version_tag}" != "dev" ]] then