Merge commit 'ee71967054486ebbdb4580563cfcdd4a30c85aa2' into main

sourcesense · Oct 26, 2020 · f1c785f · f1c785f
2 parents 0d5e79a + ee71967
commit f1c785f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/versions.sh b/lib/versions.sh
@@ -130,11 +130,10 @@ 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
 
-    baseVersion=${baseVersion%%-*}
     patchNumber=$(get_patch_number "$baseVersion")
     log "checking version $version (baseVersion:$baseVersion, isSnapshot:${isSnapshot:-false}, isRC:${isRC:-false}, patchNumber:$patchNumber) in branch $branch"