Merge remote-tracking branch 'origin/candidate-9.8.x'

Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Jul 11, 2024 · cef7a17 · cef7a17
2 parents 1a7eedd + e4d9718
commit cef7a17
Show file tree

Hide file tree

Showing 20 changed files with 640 additions and 457 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -76,17 +76,6 @@ jobs:
           generateReleaseNotes: false
           prerelease: ${{ contains(github.ref, '-rc') }}
 
-      - name: Release LN
-        uses: ncipollo/[email protected]
-        with:
-          allowUpdates: true
-          generateReleaseNotes: false
-          prerelease: ${{ contains(github.ref, '-rc') }}
-          owner: ${{ secrets.LNB_ACTOR }}
-          repo: LN
-          token: ${{ secrets.LNB_TOKEN }}
-          tag: ${{ steps.vars.outputs.internal_tag }}
-
   build-docker:
     name: Build Docker
     needs: preamble
@@ -352,19 +341,6 @@ jobs:
             cmake -S /hpcc-dev/LN -B /hpcc-dev/build -DHPCC_SOURCE_DIR=/hpcc-dev/HPCC-Platform ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DINCLUDE_PLUGINS=ON -DCONTAINERIZED=ON -DSUPPRESS_REMBED=ON -DSUPPRESS_V8EMBED=ON -DSUPPRESS_SPARK=ON -DCPACK_STRIP_FILES=ON ${{ matrix.cmake_options_extra }} && \
             cmake --build /hpcc-dev/build --parallel $(nproc) --target package"
 
-      - name: Upload Assets (internal)
-        if: ${{ matrix.ln }}
-        uses: ncipollo/[email protected]
-        with:
-          allowUpdates: true
-          generateReleaseNotes: false
-          prerelease: ${{ contains(github.ref, '-rc') }}
-          owner: ${{ secrets.LNB_ACTOR }}
-          repo: LN
-          token: ${{ secrets.LNB_TOKEN }}
-          tag: ${{ needs.preamble.outputs.internal_tag }}
-          artifacts: "${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.deb,${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.rpm"
-
       - name: Upload Assets to Jfrog (debian internal)
         if: ${{ matrix.ln && !matrix.container && contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
         shell: bash
@@ -587,18 +563,6 @@ jobs:
           cd ./build
           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/[email protected]
-        with:
-          allowUpdates: true
-          generateReleaseNotes: false
-          prerelease: ${{ contains(github.ref, '-rc') }}
-          owner: ${{ secrets.LNB_ACTOR }}
-          repo: LN
-          token: ${{ secrets.LNB_TOKEN }}
-          tag: ${{ needs.preamble.outputs.internal_tag }}
-          artifacts: "./build/hpccsystems-clienttools-internal*.exe,./build/hpccsystems-clienttools-internal*.msi,./build/hpccsystems-clienttools-internal*.dmg,./build/hpccsystems-clienttools-internal*.pkg,./build/hpccsystems-clienttools-internal*.tar.gz"
-
       - name: Upload Assets to Jfrog (windows)
         if: ${{ contains(matrix.os, 'windows') && github.repository_owner == 'hpcc-systems' }}
         shell: bash

diff --git a/common/workunit/workunit.cpp b/common/workunit/workunit.cpp
@@ -14502,16 +14502,12 @@ void executeThorGraph(const char * graphName, IConstWorkUnit &workunit, const IP
             }
         }
     }
-    else
+
     {
         Owned<IWorkUnit> w = &workunit.lock();
         WUState state = w->getState();
         if (WUStateFailed == state)
             throw makeStringException(0, "Workunit failed");
-    }
-
-    {
-        Owned<IWorkUnit> w = &workunit.lock();
         w->setState(WUStateRunning);
     }
 #else

diff --git a/esp/src/eclwatch/HPCCPlatformWidget.js b/esp/src/eclwatch/HPCCPlatformWidget.js
@@ -258,11 +258,11 @@ define([
                             switch (response.MyAccountResponse.passwordDaysRemaining) {
                                 case null:
                                     break;
-                                case -1:
+                                case -1: // password has expired
                                     alert(context.i18n.PasswordExpired);
                                     context._onUserID();
                                     break;
-                                case -2:
+                                case -2: // password never expires
                                     break;
                                 default:
                                     if (response.MyAccountResponse.passwordDaysRemaining && response.MyAccountResponse.passwordDaysRemaining <= response.MyAccountResponse.passwordExpirationWarningDays) {