From 34528a6861dca2411fdd686b367ff7ae08ecf434 Mon Sep 17 00:00:00 2001 From: Antonio Locane Date: Mon, 26 Oct 2020 15:08:48 +0100 Subject: [PATCH 1/2] removed redundant line --- lib/versions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/versions.sh b/lib/versions.sh index 74c2f0b..5460e3d 100644 --- a/lib/versions.sh +++ b/lib/versions.sh @@ -134,7 +134,6 @@ check_version() { isRC=true fi - baseVersion=${baseVersion%%-*} patchNumber=$(get_patch_number "$baseVersion") log "checking version $version (baseVersion:$baseVersion, isSnapshot:${isSnapshot:-false}, isRC:${isRC:-false}, patchNumber:$patchNumber) in branch $branch" From ee71967054486ebbdb4580563cfcdd4a30c85aa2 Mon Sep 17 00:00:00 2001 From: Antonio Locane Date: Mon, 26 Oct 2020 15:13:37 +0100 Subject: [PATCH 2/2] fixed rc check --- lib/versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/versions.sh b/lib/versions.sh index 5460e3d..abcf28b 100644 --- a/lib/versions.sh +++ b/lib/versions.sh @@ -130,7 +130,7 @@ check_version() { isSnapshot=true fi unset isRC - if [[ $baseVersion =~ .*-rc[1-9]?[0-9]* ]]; then + if [[ $version =~ .*-rc[1-9]?[0-9]*(-SNAPSHOT)? ]]; then isRC=true fi