Merge remote-tracking branch 'origin/candidate-9.0.x' into candidate-…

…9.2.x Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Feb 15, 2024 · c9ea3f8 · c9ea3f8
2 parents 9c1f8f5 + 29d5a82
commit c9ea3f8
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 55 deletions.
diff --git a/.github/workflows/build-and-publish-debug.yml b/.github/workflows/build-and-publish-debug.yml
@@ -22,7 +22,7 @@ jobs:
         run: |
           sudo rm -rf /usr/local/lib/android
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build
         uses: ./dockerfiles
         with:

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -22,7 +22,7 @@ jobs:
         run: |
           sudo rm -rf /usr/local/lib/android
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build
         uses: ./dockerfiles
         with:
@@ -48,7 +48,7 @@ jobs:
       run: |
         sudo rm -rf /usr/local/lib/android
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Build
       uses: ./dockerfiles
       with:

diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -68,14 +68,14 @@ jobs:
           echo "${{ toJSON(steps.vars.outputs) }})"
 
       - name: Release HPCC-Platform
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
           prerelease: ${{ contains(github.ref, '-rc') }}
 
       - name: Release LN
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -128,15 +128,15 @@ jobs:
           sudo rm -rf /usr/local/lib/android
 
       - name: Checkout HPCC-Platform
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.preamble.outputs.community_ref }}
           submodules: recursive
           path: ${{ needs.preamble.outputs.folder_platform }}
 
       - name: Checkout LN
         if: ${{ matrix.ln }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/LN
           token: ${{ secrets.LNB_TOKEN }}
@@ -162,16 +162,16 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Create Build Image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/${{ matrix.os }}.dockerfile
@@ -233,7 +233,7 @@ jobs:
 
       - name: Upload Assets (community)
         if: ${{ !matrix.ln }}
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -250,7 +250,7 @@ jobs:
           echo "$k8s_pkg_file"
 
       - name: Create Docker Image (community)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         if: ${{ !matrix.ln && matrix.container && !matrix.documentation }}
         with:
           builder: ${{ steps.buildx.outputs.name }}
@@ -268,7 +268,7 @@ jobs:
       #  Internal Build  ---
       - name: Login to JFrog (internal)
         if: ${{ matrix.ln && matrix.container && github.repository_owner == 'hpcc-systems' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ secrets.JFROG_REGISTRY }}
           username: ${{ secrets.JFROG_USERNAME }}
@@ -315,7 +315,7 @@ jobs:
 
       - name: Upload Assets (internal)
         if: ${{ matrix.ln }}
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -364,7 +364,7 @@ jobs:
 
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-${{ matrix.ln }}-${{ matrix.container }}-${{ matrix.documentation }}-logs
           path: ${{ needs.preamble.outputs.folder_build }}/**/*.log
@@ -409,14 +409,14 @@ jobs:
           ${{ matrix.sudo }} rm -rf "$VCPKG_INSTALLATION_ROOT"
 
       - name: Checkout HPCC-Platform
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.preamble.outputs.community_ref }}
           submodules: recursive
           path: ./HPCC-Platform
 
       - name: Checkout LN
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/LN
           token: ${{ secrets.LNB_TOKEN }}
@@ -448,7 +448,7 @@ jobs:
           cmake --build ./build ${{ matrix.cmake_build_options }} --target package
 
       - name: Upload Assets
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -464,7 +464,7 @@ jobs:
           cmake --build ./build ${{ matrix.cmake_build_options }} --target package
 
       - name: Upload LN Assets
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -477,7 +477,7 @@ jobs:
 
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-logs
           path: ./build/**/*.log
diff --git a/.github/workflows/build-containers-pr.yml b/.github/workflows/build-containers-pr.yml
@@ -65,7 +65,7 @@ jobs:
           echo "platform_build = ${{ steps.vars.outputs.platform_build }}"
 
       - name: Checkout PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Calculate vcpkg vars
         id: vcpkg_vars
@@ -78,7 +78,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
         with:
           driver: docker
 
@@ -107,7 +107,7 @@ jobs:
       # or they'll be a "latest" which will have been picked up by the check-images step.
       - name: branch image
         if: ${{ steps.check-images.outputs.prbase_missing == '1' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./dockerfiles/platform-build/Dockerfile
@@ -127,7 +127,7 @@ jobs:
             BUILD_THREADS=${{ steps.vars.outputs.build_threads }}
 
       - name: PR image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./dockerfiles/platform-build-incremental-container/Dockerfile

diff --git a/.github/workflows/build-containers-target-branch.yml b/.github/workflows/build-containers-target-branch.yml
@@ -62,7 +62,7 @@ jobs:
           echo "build_base_label = ${{ steps.vars.outputs.build_base_label }}"
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Calculate vcpkg vars
         id: vcpkg_vars
@@ -75,24 +75,24 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       # - name: Login to GitHub Container Registry
-      #   uses: docker/login-action@v1
+      #   uses: docker/login-action@v3
       #   with:
       #     registry: ghcr.io
       #     username: ${{ github.repository_owner }}
       #     password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       # build branch image
       - name: branch image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./dockerfiles/platform-build/Dockerfile

diff --git a/.github/workflows/build-test-eclwatch.yml b/.github/workflows/build-test-eclwatch.yml
@@ -32,14 +32,14 @@ jobs:
     if: ${{ needs.pre_job.outputs.eclwatch }}
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ./esp/src/node_modules
           key: npm-deps-${{ hashFiles('./esp/src/package-lock.json') }}

diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -106,15 +106,15 @@ jobs:
 
       - name: Checkout HPCC-Platform
         if: ${{ contains(matrix.event_name, github.event_name) && needs.preamble.outputs.platform }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.preamble.outputs.community_ref }}
           submodules: recursive
           path: ${{ needs.preamble.outputs.folder_platform }}
 
       - name: Checkout LN
         if: ${{ matrix.ln && contains(matrix.event_name, github.event_name) }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/LN
           token: ${{ secrets.LNB_TOKEN }}
@@ -142,7 +142,7 @@ jobs:
       - name: Set up Docker Buildx
         if: ${{ contains(matrix.event_name, github.event_name) && needs.preamble.outputs.platform }}
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Pull previous images
         run: |
@@ -151,7 +151,7 @@ jobs:
 
       - name: Create Build Image  
         if: ${{ contains(matrix.event_name, github.event_name) && needs.preamble.outputs.platform }}
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: ${{ needs.preamble.outputs.folder_platform }}/dockerfiles/vcpkg/${{ matrix.os }}.dockerfile
@@ -215,7 +215,7 @@ jobs:
       #  Common  ---
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-${{ matrix.ln }}-${{ matrix.container }}-logs
           path: ${{ needs.preamble.outputs.folder_build }}/**/*.log
@@ -326,7 +326,7 @@ jobs:
 
       - name: Checkout HPCC-Platform
         if: ${{ contains(matrix.event_name, github.event_name) && needs.preamble.outputs.platform }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.preamble.outputs.community_ref }}
           submodules: recursive
@@ -360,7 +360,7 @@ jobs:
 
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}--${{ matrix.ln }}-${{ matrix.container }}-logs
           path: ./build/**/*.log
diff --git a/.github/workflows/codeql-eclwatch.yml b/.github/workflows/codeql-eclwatch.yml
@@ -51,11 +51,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -80,4 +80,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/jirabot.yml b/.github/workflows/jirabot.yml
@@ -14,7 +14,7 @@ jobs:
   jirabot:
     runs-on: ubuntu-20.04
     steps:
-      - uses: "actions/setup-python@v2"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.8"
       - name: "Install dependencies"

diff --git a/.github/workflows/nightly-publish.yml b/.github/workflows/nightly-publish.yml
@@ -14,7 +14,7 @@ jobs:
         run: |
           echo "::set-output name=date::$(date +'%Y-%m-%d')"
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build
         uses: ./dockerfiles
         with: