Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-32690 Add CentOS 7 back into the 9.8.x releases #19133

Closed
wants to merge 1 commit into from
Closed

HPCC-32690 Add CentOS 7 back into the 9.8.x releases #19133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not clear why this changed - it would be worth having a comment in the file to explain.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we have to pin that label to the older 9.8.x build. If he kept the logic the same as everything else, we'd be reliant on a build with the current vcpkg_sha_short. And the current vcpkg version that we use for 9.8.x will fail for centos-7. This looks like a pretty clean way to sidestep that problem and 'pin' the centos-7 builds to our older hpcc-platform-9.8.x tag that we have pushed.

Copy link
Member Author

@GordonSmith GordonSmith Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Further - this pattern x == y && aaa || bbb can be read as x == y ? aaa : bbb

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GordonSmith I was looking for a comment in the yml file explaining why this needs to be special-cased, not what it was doing.


- name: Print vars
shell: "bash"
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- 'ubuntu-22.04'
- 'ubuntu-20.04'
- 'rockylinux-8'
- 'centos-7'
description: 'Operating System'
required: false
default: 'ubuntu-22.04'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/vcpkg/centos-7.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
Loading