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

…9.4.x
hpcc-systems · Feb 15, 2024 · 751647a · 751647a
2 parents 18b5812 + c9ea3f8
commit 751647a
Show file tree

Hide file tree

Showing 26 changed files with 375 additions and 990 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
@@ -70,14 +70,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
@@ -150,15 +150,15 @@ jobs:
           df -h
 
       - 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 || matrix.ee }} 
-        uses: actions/checkout@v3
+        if: ${{ matrix.ln }}
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/LN
           token: ${{ secrets.LNB_TOKEN }}
@@ -184,16 +184,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
@@ -266,7 +266,7 @@ jobs:
 
       - name: Upload Assets (community)
         if: ${{ !matrix.ln && !matrix.ee }}
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -283,7 +283,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.ee && matrix.container && !matrix.documentation }}
         with:
           builder: ${{ steps.buildx.outputs.name }}
@@ -301,7 +301,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 }}
@@ -348,7 +348,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
@@ -424,7 +424,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
@@ -469,14 +469,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 }}
@@ -536,7 +536,7 @@ jobs:
           compression-level: 0
 
       - name: Upload Assets
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -559,7 +559,7 @@ jobs:
           C:\"Program Files (x86)"\"Microsoft SDKs"\ClickOnce\SignTool\signtool.exe sign /debug /f ../sign/hpcc_code_signing.pfx /p ${{ secrets.SIGNING_CERTIFICATE_PASSPHRASE }} /t http://timestamp.digicert.com /fd SHA256 hpccsystems-clienttools*.exe
 
       - name: Upload LN Assets
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
           generateReleaseNotes: false
@@ -572,7 +572,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
@@ -588,14 +588,14 @@ jobs:
           echo "${{ toJSON(needs.preamble.outputs) }})"
 
       - 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 ECLIDE
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/ECLIDE
           ref: ${{ needs.preamble.outputs.eclide_ref }}

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -86,14 +86,14 @@ jobs:
           df -h
 
       - name: Checkout HPCC-Platform
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ github.workspace }}/HPCC-Platform
 
       - name: Checkout LN
         if: ${{ inputs.ln == true }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/LN
           token: ${{ secrets.LNB_TOKEN }}

diff --git a/.github/workflows/build-gh_runner.yml b/.github/workflows/build-gh_runner.yml
@@ -135,14 +135,14 @@ jobs:
           ${{ !contains(inputs.os, 'windows') && 'sudo' || '' }} rm -rf "$VCPKG_INSTALLATION_ROOT"
 
       - name: Checkout HPCC-Platform
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ github.workspace }}/HPCC-Platform
 
       - name: Checkout LN
         if: ${{ inputs.ln == true }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/LN
           token: ${{ secrets.LNB_TOKEN }}

diff --git a/.github/workflows/build-test-eclwatch.yml b/.github/workflows/build-test-eclwatch.yml
@@ -32,10 +32,10 @@ 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: Install Dependencies

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/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
 

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:

diff --git a/.github/workflows/test-eclhelper.yml b/.github/workflows/test-eclhelper.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout pr
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Fetch base

diff --git a/.github/workflows/test-helm.yml b/.github/workflows/test-helm.yml
@@ -40,7 +40,7 @@ jobs:
     needs: pre_job
     if: ${{ github.repository == 'hpcc-systems/HPCC-Platform' && needs.pre_job.outputs.helm }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: false
       - uses: azure/setup-helm@v3

diff --git a/.github/workflows/test-regression-suite-k8s.yml b/.github/workflows/test-regression-suite-k8s.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ./HPCC-Platform

diff --git a/esp/src/CMakeLists.txt b/esp/src/CMakeLists.txt
@@ -249,7 +249,6 @@ set ( SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/src/ESPActivity.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/ESPBase.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/ESPDFUWorkunit.ts
-    ${CMAKE_CURRENT_BINARY_DIR}/src/ESPGraph.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/ESPLogicalFile.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/ESPPackageProcess.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/ESPPreflight.ts

diff --git a/esp/src/eclwatch/JSGraphWidget.js b/esp/src/eclwatch/JSGraphWidget.js
@@ -6,17 +6,17 @@ define([
     "dojo/Evented",
 
     "@hpcc-js/common",
+    "@hpcc-js/comms",
     "@hpcc-js/graph",
     "@hpcc-js/layout",
 
     "hpcc/GraphWidget",
-    "src/ESPGraph",
     "src/Utility",
 
     "css!font-awesome/css/font-awesome.css"
 ], function (declare, lang, nlsHPCCMod, arrayUtil, Evented,
-    hpccCommon, hpccGraph, hpccLayout,
-    GraphWidget, ESPGraph, Utility) {
+    hpccCommon, hpccComms, hpccGraph, hpccLayout,
+    GraphWidget, Utility) {
 
     var nlsHPCC = nlsHPCCMod.default;
     var faCharFactory = function (kind) {
@@ -69,7 +69,7 @@ define([
         KeyState_Menu: 4,
 
         constructor: function (domNode) {
-            this.graphData = new ESPGraph.Graph();
+            this.graphData = new hpccComms.QueryGraph();
             this.graphWidget = new hpccGraph.Graph()
                 .allowDragging(false)
                 .showToolbar(false)
@@ -471,7 +471,7 @@ define([
     return declare("JSGraphWidget", [GraphWidget], {
         baseClass: "JSGraphWidget",
         constructor: function () {
-            this.graphData = new ESPGraph.Graph();
+            this.graphData = new hpccComms.QueryGraph();
         },
 
         hasOptions: function (key, val) {