Ver código fonte

HPCC-24372 Tagging point releases should upmerge to minor branch

Fix a typo

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 anos atrás
pai
commit
7451de08fb
2 arquivos alterados com 2 adições e 2 exclusões
  1. 1 1
      cmake_modules/go_gold.sh
  2. 1 1
      cmake_modules/go_rc.sh

+ 1 - 1
cmake_modules/go_gold.sh

@@ -96,6 +96,6 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
 fi
 
 # upmerge back to minor closedown branch to ensure incr.sh works
-doit "git checkout candidate_$HPCC_MAJOR.$NEW_MINOR.x"
+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" 

+ 1 - 1
cmake_modules/go_rc.sh

@@ -108,6 +108,6 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
 fi
 
 # upmerge back to minor closedown branch to ensure incr.sh works
-doit "git checkout candidate_$HPCC_MAJOR.$NEW_MINOR.x"
+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"