From 220cf977852186dbd9103eb639915a5ce0521211 Mon Sep 17 00:00:00 2001 From: Christoph Schabert Date: Mon, 4 Apr 2022 09:54:52 +0200 Subject: [PATCH] build-java.sh edited online with Bitbucket --- 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 23282b5..02faa3e 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -6,12 +6,12 @@ SERVICE_NAME=$1 if [[ "$bamboo_planRepository_branchName" == "master" ]] then branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') - latestVersion=$(git tag -l $branchVersion.* | tail -n1) + latestVersion=$( semver $(git tag -l "${version}-*" ) | 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=$(git tag -l $branchVersion.* | tail -n1) + latestVersion=$( semver $(git tag -l "${version}-*" ) | tail -n1 ) newVersion="$(semver $latestVersion -p -i patch)" elif [[ "${bamboo_version_tag}" != "dev" ]] then @@ -55,4 +55,4 @@ mvn --no-transfer-progress \ mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ - docker:push \ No newline at end of file + docker:push