diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml index 4babda36283..93db5a7d588 100644 --- a/.github/workflows/build-assets.yml +++ b/.github/workflows/build-assets.yml @@ -91,6 +91,8 @@ jobs: name: docs documentation: true - os: ubuntu-20.04 + - os: centos-7 + cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic" - os: rockylinux-8 - os: ubuntu-22.04 name: LN k8s @@ -105,6 +107,10 @@ jobs: - os: ubuntu-20.04 name: LN ln: true + - os: centos-7 + name: LN + cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic" + ln: true - os: rockylinux-8 name: LN cmake_options_extra: "" diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 7c5090750b6..e930f6f1640 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -112,7 +112,7 @@ jobs: vcpkg_sha_short=$(git rev-parse --short=8 HEAD) echo "vcpkg_sha_short=$vcpkg_sha_short" >> $GITHUB_OUTPUT docker_build_label=hpccsystems/platform-build-base-${{ inputs.os }} - echo "docker_tag=$docker_build_label:$vcpkg_sha_short" >> $GITHUB_OUTPUT + echo "docker_tag=$docker_build_label:${{ inputs.os == 'centos-7' && 'hpcc-platform-9.8.x' || '$vcpkg_sha_short' }}" >> $GITHUB_OUTPUT - name: Print vars shell: "bash" diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index a29f49f26e1..e6a6a09815a 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' @@ -138,6 +139,14 @@ 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 + cmake-configuration-ex: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic" + 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/centos-7.dockerfile b/dockerfiles/vcpkg/centos-7.dockerfile index 04d1ba29af5..be02cbfe49c 100644 --- a/dockerfiles/vcpkg/centos-7.dockerfile +++ b/dockerfiles/vcpkg/centos-7.dockerfile @@ -1,5 +1,5 @@ ARG VCPKG_REF=latest -FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF +FROM hpccsystems/platform-build-base-centos-7:hpcc-platform-9.8.x ENTRYPOINT ["/bin/bash", "--login", "-c"]