HPCC-33205 Reenable CentOS-7 builds

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Jan 14, 2025 · 21c455b · 21c455b
1 parent 37b92f3
commit 21c455b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
+1 −0		.dockerignore
+1 −0		.github/workflows/prebuild-docker.yml
+44 −0		dockerfiles/CentOS-Base.repo
+4 −5		dockerfiles/build.sh
+7 −5		dockerfiles/centos-7.dockerfile