فهرست منبع

Merge branch 'candidate-8.2.0' into candidate-8.2.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 سال پیش
والد
کامیت
28b9310621
2فایلهای تغییر یافته به همراه4 افزوده شده و 4 حذف شده
  1. 2 2
      .github/workflows/build-and-publish.yml
  2. 2 2
      cmake_modules/go_gold.sh

+ 2 - 2
.github/workflows/build-and-publish.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          latest: 0   # this should only be set on the current minor branch
+          latest: 1   # this should only be set on the current minor branch
 
   ml-builds:
     needs: build
@@ -42,6 +42,6 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-        latest: 0   # this should only be set on the current minor branch
+        latest: 1   # this should only be set on the current minor branch
         build_ml: ${{ matrix.engine }}
 

+ 2 - 2
cmake_modules/go_gold.sh

@@ -85,7 +85,7 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "git submodule update --init --recursive"
   HPCC_PROJECTS=hpcc-helm
   HPCC_NAME=HPCC
-  if [[ "$HPCC_MAJOR" == "8" ]] && [[ "$HPCC_MINOR" == "0" ]] ; then
+  if [[ "$HPCC_MAJOR" == "8" ]] && [[ "$HPCC_MINOR" == "2" ]] ; then
     doit "rm -rf ./helm"
     doit "cp -rf $HPCC_DIR/helm ./helm" 
     doit "rm -f ./helm/*.bak" 
@@ -100,7 +100,7 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "git add *.tgz"
   
   doit "git commit -a -s -m \"$HPCC_NAME Helm Charts $HPCC_SHORT_TAG\""
-  if [[ "$HPCC_MAJOR" == "8" ]] && [[ "$HPCC_MINOR" == "0" ]] ; then
+  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
   doit "git push $REMOTE master $FORCE"