Skip to content

Commit

Permalink
HPCC-31335 update build-assets.yml for Rocky Linux 8 support
Browse files Browse the repository at this point in the history
Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Apr 17, 2024
1 parent 6e9043b commit a78b20f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/workflows/build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ jobs:
name: docs
documentation: true
- os: ubuntu-20.04
- os: centos-8
- os: centos-7
cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
- os: amazonlinux
Expand All @@ -120,6 +121,10 @@ jobs:
- os: ubuntu-20.04
name: LN
ln: true
- os: centos-8
name: LN
cmake_options_extra: ""
ln: true
- os: centos-7
name: LN
cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
Expand Down
9 changes: 8 additions & 1 deletion cmake_modules/getpackagerevisionarch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ elif [ -e /etc/redhat-release ]; then
OS_GROUP=`/bin/rpm -q --qf "%{NAME}" --whatprovides /etc/redhat-release | sed 's/-release.*//' | tr '[A-Z]' '[a-z]'`
REDHAT_VERSION=`/bin/rpm -q --qf "%{VERSION}" --whatprovides /etc/redhat-release | cut -f1 -d"."`
case "$OS_GROUP" in
"centos"* | "fedora" | "rocky")
"centos"* | "fedora")
if [ ${NOARCH} -eq 0 ]; then
OUTPUT="el${REDHAT_VERSION}.${ARCH}"
else
Expand All @@ -100,6 +100,13 @@ elif [ -e /etc/redhat-release ]; then
OUTPUT="el${REDHAT_VERSION}"
fi
;;
"rocky")
if [ ${NOARCH} -eq 0 ]; then
OUTPUT="rocky${REDHAT_VERSION}.${ARCH}"
else
OUTPUT="rocky${REDHAT_VERSION}"
fi
;;
esac
fi
elif [ -e /etc/SuSE-release ]; then
Expand Down
4 changes: 4 additions & 0 deletions dockerfiles/vcpkg/rockylinux-8.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ FROM hpccsystems/platform-build-base-rockylinux-8:$VCPKG_REF

ENTRYPOINT ["/bin/bash", "--login", "-c"]

RUN yum install -y \
rpm-build && \
yum -y clean all && rm -rf /var/cache

CMD ["/bin/bash"]

0 comments on commit a78b20f

Please sign in to comment.