From a4ca73ec6ee43eb1aeb48120f01ea37995b5fc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Willi=20Sch=C3=B6nborn?= Date: Thu, 18 Mar 2021 12:02:17 +0100 Subject: [PATCH] Fixed release script --- release.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/release.sh b/release.sh index 42a9977b8..83b21ee59 100755 --- a/release.sh +++ b/release.sh @@ -1,24 +1,24 @@ #!/bin/sh -ex -: ${1?"Usage: $0 <[pre]major|[pre]minor|[pre]patch|prerelease>"} +: "${1?"Usage: $0 <[pre]major|[pre]minor|[pre]patch|prerelease>"}" ./mvnw scm:check-local-modification -current=$(git describe --abbrev=0 || echo 0.0.0) -release=$(semver ${current} -i $1 --preid RC) -next=$(semver ${release} -i minor) +current=$({ echo 0.0.0; git tag --list --sort=version:refname; } | tail -n1) +release=$(semver "${current}" -i "$1" --preid RC) +next=$(semver "${release}" -i minor) -git checkout -b release/${release} +git checkout -b "release/${release}" -./mvnw versions:set -D newVersion=${release} +./mvnw versions:set -D newVersion="${release}" git commit -am "Release ${release}" -./mvnw clean deploy scm:tag -P release -D tag=${release} -D pushChanges=false -D skipTests -D dependency-check.skip +./mvnw clean deploy scm:tag -P release -D tag="${release}" -D pushChanges=false -D skipTests -D dependency-check.skip -./mvnw versions:set -D newVersion=${next}-SNAPSHOT +./mvnw versions:set -D newVersion="${next}-SNAPSHOT" git commit -am "Development ${next}-SNAPSHOT" git push git push --tags git checkout main -git branch -D release/${release} +git branch -D "release/${release}"