From 74a094b42d091f7b9f4fc51ad182f995cbd2ec05 Mon Sep 17 00:00:00 2001 From: Christoph Schabert Date: Mon, 13 Mar 2023 09:41:59 +0100 Subject: [PATCH] Change Tagging --- .../src/main/resources/scripts/build-java.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index 9893a30..4f8870c 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -5,27 +5,27 @@ SERVICE_NAME=$1 if [[ "$bamboo_planRepository_branchName" == "master" ]] then - echo "building on master branch" - branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') - echo "branch version is : $branchVersion" - latestVersion=$(semver $( git tag -l $branchVersion.* ) | tail -n1) - echo "latestVersion is : $latestVersion" + 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)" - echo "newVersion is : $newVersion" + echo "new release on master with version $newVersion" 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)" + echo "new release on $bamboo_planRepository_branchName with version $newVersion" elif [[ "${bamboo_version_tag}" != "dev" ]] then newVersion="${bamboo_version_tag}" + echo "new special version bild with $newVersion" else mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ --no-transfer-progress \ ${bamboo_maven_add_param} \ clean install \ -Djava.security.egd=file:/dev/./urandomelse + echo "dev build with tag ${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag exit 0 fi