From e3f5049b7741cb84a6df1e0e1b80603e9df8d70e Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 27 Oct 2023 00:03:25 +0100 Subject: [PATCH 1/2] HPCC-30682 Fix uninitialized class member in CMasterWatchdog Signed-off-by: Jake Smith --- thorlcr/master/mawatchdog.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thorlcr/master/mawatchdog.hpp b/thorlcr/master/mawatchdog.hpp index 11d3c8d9fad..2bfc31cbf79 100644 --- a/thorlcr/master/mawatchdog.hpp +++ b/thorlcr/master/mawatchdog.hpp @@ -31,7 +31,7 @@ class CMasterWatchdogBase : public CSimpleInterface, implements IThreaded PointerArray state; SocketEndpoint master; Mutex mutex; - int retrycount; + int retrycount = 0; CThreaded threaded; protected: bool stopped; From 4567176759e07591dfbf86a0079d732c3241fd31 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Tue, 31 Oct 2023 02:39:18 +0000 Subject: [PATCH 2/2] HPCC-30720 Remove the LN build and push from build-and-publish We now build and push the LN images in build-assets.yml, build-and-publish now longer needs to. (was causing build-and-publish to overwrite the image built by build-assets) Signed-off-by: Jake Smith --- .github/workflows/build-and-publish.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 2d09d008f2e..5d869bfc44c 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -53,28 +53,3 @@ jobs: github_actor: ${{ secrets.LNB_ACTOR }} github_token: ${{ secrets.LNB_TOKEN }} - ln-builds: - needs: build - runs-on: ubuntu-20.04 - if: github.repository == 'hpcc-systems/HPCC-Platform' - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Build - uses: ./dockerfiles - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - ln_username: ${{ secrets.JFROG_USERNAME }} - ln_password: ${{ secrets.JFROG_PASSWORD }} - ln_registry: ${{ secrets.JFROG_REGISTRY }} - ln_docker_repo: ${{ secrets.JFROG_REPOSITORY }} - lnb_token: ${{ secrets.LNB_TOKEN }} - latest: 1 # this should only be set on the current minor branch - build_ln: 1 - github_actor: ${{ secrets.LNB_ACTOR }} - github_token: ${{ secrets.LNB_TOKEN }} - sign_modules: 1 - signing_secret: ${{ secrets.SIGNING_SECRET }} - signing_keyid: ${{ secrets.SIGNING_KEYID }} - signing_passphrase: ${{ secrets.SIGNING_PASSPHRASE }}