From 5eb837e91f3319b257a0bbbcee6ec56584244d99 Mon Sep 17 00:00:00 2001 From: Tim van Oostrom Date: Mon, 6 May 2024 16:24:53 +0200 Subject: [PATCH] Change tag handling --- scripts/release.sh | 4 ++-- scripts/semver.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 77b124887a..80196d6207 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -48,8 +48,8 @@ RELEASE_BRANCH="${BRANCH}-v${NEW_TAG}" && \ echo "Creating branch $RELEASE_BRANCH" && \ git branch -m "$RELEASE_BRANCH" && \ -echo "New tag $NEW_TAG" && \ -git tag -a "$NEW_TAG" -m "Production ${NEW_TAG}" && \ +echo "New tag: release-v${NEW_TAG}" && \ +git tag -a "release-v${NEW_TAG}" -m "Production ${NEW_TAG}" && \ echo "Pushing branch $RELEASE_BRANCH" && \ git push origin --follow-tags "$RELEASE_BRANCH" && \ diff --git a/scripts/semver.sh b/scripts/semver.sh index 456bafb6a8..e49bb4b0d7 100644 --- a/scripts/semver.sh +++ b/scripts/semver.sh @@ -20,9 +20,10 @@ fi # echo "Current Version: $CURRENT_VERSION" - +#replace release-v text from tag +CURRENT_VERSION_NUMS=(${CURRENT_VERSION//release-v/}) #replace . with space so can split into an array -CURRENT_VERSION_PARTS=(${CURRENT_VERSION//./ }) +CURRENT_VERSION_PARTS=(${CURRENT_VERSION_NUMS//./ }) #get number parts VNUM1=${CURRENT_VERSION_PARTS[0]}