HPCC-26196 Helm version naming conversion causing releases to be treated as devel

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

cmake_modules/go_gold.sh

@@ -67,7 +67,7 @@ set_tag
 
 # Commit the change
 doit "git add $VERSIONFILE"
-doit "git commit -s -m \"$HPCC_NAME $HPCC_SHORT_TAG Gold\""
+doit "git commit -s -m \"$HPCC_NAME $HPCC_SHORT_TAG-$HPCC_SEQUENCE Gold\""
 doit "git push $REMOTE $GIT_BRANCH $FORCE"
 
 # tag it
@@ -99,7 +99,7 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "helm repo index . --url https://hpcc-systems.github.io/helm-chart"
   doit "git add *.tgz"
   
-  doit "git commit -a -s -m \"$HPCC_NAME Helm Charts $HPCC_SHORT_TAG\""
+  doit "git commit -a -s -m \"$HPCC_NAME Helm Charts $HPCC_SHORT_TAG-$HPCC_SEQUENCE\""
   if [[ "$HPCC_MAJOR" == "8" ]] && [[ "$HPCC_MINOR" == "2" ]] ; then
     doit "git tag $FORCE $HPCC_MAJOR.$HPCC_MINOR.$HPCC_POINT && git push $REMOTE $HPCC_MAJOR.$HPCC_MINOR.$HPCC_POINT $FORCE"
   fi

cmake_modules/parse_cmake.sh

@@ -119,12 +119,13 @@ function doit2()
 function set_tag()
 {
     local _prefix=$1
-    local _maturity=$HPCC_MATURITY
     if [ "$HPCC_MATURITY" = "release" ]; then
-      _maturity=
+      HPCC_SHORT_TAG=$HPCC_MAJOR.$HPCC_MINOR.$HPCC_POINT
+      HPCC_LONG_TAG=${_prefix}_$HPCC_SHORT_TAG-$HPCC_SEQUENCE
+    else
+      HPCC_SHORT_TAG=$HPCC_MAJOR.$HPCC_MINOR.$HPCC_POINT-$HPCC_MATURITY$HPCC_SEQUENCE
+      HPCC_LONG_TAG=${_prefix}_$HPCC_SHORT_TAG
     fi
-    HPCC_SHORT_TAG=$HPCC_MAJOR.$HPCC_MINOR.$HPCC_POINT-$_maturity$HPCC_SEQUENCE
-    HPCC_LONG_TAG=${_prefix}_$HPCC_SHORT_TAG
 }
 
 function update_version_file()

cmake_modules/parse_hpcc_chart.sh

@@ -53,7 +53,7 @@ function update_chart_file()
       _new_minor=$HPCC_MINOR
     fi
     if [ "$_new_maturity" == "release" ] ; then
-      local _v=${HPCC_MAJOR}.${_new_minor}.${_new_point}-${_new_sequence}
+      local _v=${HPCC_MAJOR}.${_new_minor}.${_new_point}
     else
       local _v=${HPCC_MAJOR}.${_new_minor}.${_new_point}-${_new_maturity}${_new_sequence}
     fi