From b42961d031fdeebe7f00975feef27f7ee303943e Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 26 Oct 2023 14:48:09 +0100 Subject: [PATCH] HPCC-30649 Bump Ubuntu 23.04 to 23.10 Signed-off-by: Gordon Smith --- .github/workflows/build-vcpkg.yml | 2 +- dockerfiles/vcpkg/build.sh | 2 +- .../vcpkg/{ubuntu-23.04.dockerfile => ubuntu-23.10.dockerfile} | 2 +- vcpkg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename dockerfiles/vcpkg/{ubuntu-23.04.dockerfile => ubuntu-23.10.dockerfile} (85%) diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 3707b351c1c..0bd873d4219 100644 --- 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 index 430d1acfc54..5c3926df63d 100755 --- 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 b/dockerfiles/vcpkg/ubuntu-23.10.dockerfile similarity index 85% rename from dockerfiles/vcpkg/ubuntu-23.04.dockerfile rename to dockerfiles/vcpkg/ubuntu-23.10.dockerfile index bc25a7987dc..e154dbe5bd5 100644 --- a/dockerfiles/vcpkg/ubuntu-23.04.dockerfile +++ b/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 \ diff --git a/vcpkg b/vcpkg index 8e7b6f66fa9..4d5501e1c57 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 8e7b6f66fa9458274b22e0b921e8c0e91b49bce0 +Subproject commit 4d5501e1c5796ca7b42f4ad38731f8fd2a8c8d75