From 21c455b993530b273289425fce73e6ad31ead464 Mon Sep 17 00:00:00 2001
From: Gordon Smith <GordonJSmith@gmail.com>
Date: Mon, 13 Jan 2025 19:00:55 +0000
Subject: [PATCH] HPCC-33205 Reenable CentOS-7 builds

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
---
 .github/workflows/build-assets.yml | 3 +++
 .github/workflows/build-vcpkg.yml  | 8 ++++++++
 dockerfiles/vcpkg/build.sh         | 2 +-
 vcpkg                              | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
index a3023d14cec..7dee1bb2698 100644
--- a/.github/workflows/build-assets.yml
+++ b/.github/workflows/build-assets.yml
@@ -122,6 +122,9 @@ jobs:
             name: LN
             cmake_options_extra: ""
             ln: true
+          - os: centos-7
+            name: LN
+            ln: true
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
index 368b3910954..d47fe52010d 100644
--- a/.github/workflows/build-vcpkg.yml
+++ b/.github/workflows/build-vcpkg.yml
@@ -10,6 +10,7 @@ on:
           - 'ubuntu-22.04'
           - 'ubuntu-20.04'
           - 'rockylinux-8'
+          - 'centos-7'
         description: 'Operating System'
         required: false
         default: 'ubuntu-22.04'
@@ -168,6 +169,13 @@ jobs:
       os: rockylinux-8
     secrets: inherit
 
+  build-docker-centos-7:
+    if: ${{ contains('pull_request,push', github.event_name) }}
+    uses: ./.github/workflows/build-docker.yml
+    with:
+      os: centos-7
+    secrets: inherit
+
   build-gh_runner-ubuntu-22_04:
     if: ${{ contains('schedule,push', github.event_name) }}
     uses: ./.github/workflows/build-gh_runner.yml
diff --git a/dockerfiles/vcpkg/build.sh b/dockerfiles/vcpkg/build.sh
index c15e8a2f2f3..9993aaeadbd 100755
--- a/dockerfiles/vcpkg/build.sh
+++ b/dockerfiles/vcpkg/build.sh
@@ -36,7 +36,7 @@ function doBuild() {
     # docker pull "hpccsystems/platform-build-$1:$VCPKG_REF" || true
     # docker pull "hpccsystems/platform-build-$1:$GITHUB_BRANCH" || true
 
-    docker build --progress plain --rm -f "$SCRIPT_DIR/$1.dockerfile" \
+    docker buildx build --rm -f "$SCRIPT_DIR/$1.dockerfile" \
         --build-arg DOCKER_NAMESPACE=$DOCKER_USERNAME \
         --build-arg VCPKG_REF=$VCPKG_REF \
         --cache-from hpccsystems/platform-build-$1:$VCPKG_REF \
diff --git a/vcpkg b/vcpkg
index 5ff6ea5ea7c..79705ad27f1 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 5ff6ea5ea7c5e0f23e8632920c11e963390051c1
+Subproject commit 79705ad27f15e0d6544d82e16fb972987b1df4e8