From 4d03396d054d628663caf2f85b25c1490f06c797 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Fri, 4 Feb 2022 15:58:22 -0500 Subject: [PATCH 1/2] Migrate from CentOS to Rocky Linux CentOS 8 was discontinued and replaced by a rolling, continuously updated distribution, CentOS stream that is always ahead of RHEL 8. The Intel oneAPI Base Toolkit supports Rocky Linux 8 instead. https://blog.centos.org/2020/12/future-is-centos-stream/ https://www.intel.com/content/www/us/en/developer/articles/system-requirements/intel-oneapi-base-toolkit-system-requirements.html --- .github/workflows/container.yml | 2 +- container/{centos-8-dev => rockylinux-8-dev}/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename container/{centos-8-dev => rockylinux-8-dev}/Dockerfile (85%) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index b58098ed..bc81cb36 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -53,7 +53,7 @@ jobs: strategy: matrix: container: - - centos-8-dev + - rockylinux-8-dev - debian-11-arm-dev - opensuse-leap-15-dev - ubuntu-18.04-dev diff --git a/container/centos-8-dev/Dockerfile b/container/rockylinux-8-dev/Dockerfile similarity index 85% rename from container/centos-8-dev/Dockerfile rename to container/rockylinux-8-dev/Dockerfile index ef8b6e08..671e29b9 100644 --- a/container/centos-8-dev/Dockerfile +++ b/container/rockylinux-8-dev/Dockerfile @@ -3,7 +3,7 @@ # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/ -FROM centos:8 +FROM rockylinux:8 WORKDIR /work @@ -11,8 +11,9 @@ WORKDIR /work # to extend the `paths` on which the workflow runs. COPY scripts/. ./ -RUN sed -i '/^enabled=/s#0#1#' /etc/yum.repos.d/CentOS-Linux-PowerTools.repo \ - && grep '^enabled=1$' /etc/yum.repos.d/CentOS-Linux-PowerTools.repo \ +RUN \ + sed -i '/^enabled=/s#0#1#' /etc/yum.repos.d/Rocky-PowerTools.repo \ + && grep '^enabled=1$' /etc/yum.repos.d/Rocky-PowerTools.repo \ && yum -y upgrade \ && yum -y install \ cmake \ From 6794c9a9ad4c5b0d60b3faac89fdf43a20ce8b04 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Fri, 4 Feb 2022 16:29:26 -0500 Subject: [PATCH 2/2] Document Rocky Linux 8 support --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1ff263da..d8c5e523 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ### Linux -- Red Hat Enterprise Linux (RHEL)\* or CentOS\* 8 +- Red Hat Enterprise Linux (RHEL)\* or Rocky Linux\* 8 - SUSE Linux Enterprise Server (SLES)\* or openSUSE Leap\* 15 - Ubuntu\* 18.04 or 20.04 LTS - GCC 7.4.0 and higher @@ -134,7 +134,7 @@ ctest -V - On Linux, `aoc` requires the `libtinfo.so.5` library, which you can install using one of the following OS-specific commands: - - Red Hat Enterprise Linux (RHEL)\* or CentOS\* 8: + - Red Hat Enterprise Linux (RHEL)\* or Rocky Linux\* 8: ``` sudo yum install ncurses-compat-libs-6.1