HPCC-24372 Tagging point releases should upmerge to minor branch

The incremental building of cloud systems works better if tags for point
releases appear in the 'history' of the minor closedown branch.

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

cmake_modules/go_gold.sh

@@ -93,4 +93,9 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "git commit -a -s -m \"$HPCC_NAME Helm Charts $HPCC_SHORT_TAG Release Candidate $HPCC_SEQUENCE\""
   doit "git push $REMOTE master $FORCE"
   popd
-fi
+fi
+
+# upmerge back to minor closedown branch to ensure incr.sh works
+doit "git checkout candidate_$HPCC_MAJOR.$NEW_MINOR.x"
+doit "git merge --no-ff --no-commit -X ours candidate-$HPCC_MAJOR.$NEW_MINOR.$NEW_POINT"
+doit "if ! git diff HEAD --exit-code ; then git merge --abort ; else git commit -s && git push origin candidate-$HPCC_MAJOR.$NEW_MINOR.x ; fi" 

cmake_modules/go_rc.sh

@@ -105,4 +105,9 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "git commit -a -s -m \"$HPCC_NAME Helm Charts $HPCC_SHORT_TAG Release Candidate $HPCC_SEQUENCE\""
   doit "git push $REMOTE master $FORCE"
   popd
-fi
+fi
+
+# upmerge back to minor closedown branch to ensure incr.sh works
+doit "git checkout candidate_$HPCC_MAJOR.$NEW_MINOR.x"
+doit "git merge --no-ff --no-commit -X ours candidate-$HPCC_MAJOR.$NEW_MINOR.$NEW_POINT"
+doit "if ! git diff HEAD --exit-code ; then git merge --abort ; else git commit -s && git push origin candidate-$HPCC_MAJOR.$NEW_MINOR.x ; fi"