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

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Oct 31, 2023 · b868791 · b868791
2 parents 9638b37 + e09fb04
commit b868791
Show file tree

Hide file tree

Showing 16 changed files with 335 additions and 328 deletions.
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -59,31 +59,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: Free additional disk space (remove Android SDK + Tools)
-      run: |
-        sudo rm -rf /usr/local/lib/android
-    - 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 }}
diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-23.04
+          - os: ubuntu-23.10
             event_name: "pull_request"
           - os: ubuntu-22.04
             name: k8s

diff --git a/dockerfiles/vcpkg/build.sh b/dockerfiles/vcpkg/build.sh
@@ -59,7 +59,7 @@ function doBuild() {
 # docker run -it --mount source="$(pwd)",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached build-ubuntu-22.04:latest bash
 }
 
-# doBuild ubuntu-23.04
+# doBuild ubuntu-23.10
 # doBuild ubuntu-20.04
 # doBuild amazonlinux
 # doBuild ubuntu-22.04

diff --git a/dockerfiles/vcpkg/ubuntu-23.04.dockerfile → dockerfiles/vcpkg/ubuntu-23.10.dockerfile b/dockerfiles/vcpkg/ubuntu-23.04.dockerfile → dockerfiles/vcpkg/ubuntu-23.10.dockerfile
@@ -1,5 +1,5 @@
 ARG VCPKG_REF=latest
-FROM hpccsystems/platform-build-base-ubuntu-23.04:$VCPKG_REF
+FROM hpccsystems/platform-build-base-ubuntu-23.10:$VCPKG_REF
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     default-jdk \