From e32f2913f365d5aab26885b8e520c31c52ffeda6 Mon Sep 17 00:00:00 2001 From: Michal Sedlak Date: Mon, 5 Aug 2024 12:32:25 +0200 Subject: [PATCH 1/2] ci: remove leftover config to disable tests for CentOS7 --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c6192dc..967e8fce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,10 +95,8 @@ jobs: - name: Build and install IPFIXcol2 run: | mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=$TESTS + cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=1 make && make install - env: - TESTS: ${{ startsWith(matrix.image, 'centos:7') != true }} - name: Run tests run: cd build && make test - name: Try to run IPFIXcol2 From dee93d7e6e23f2d791a43b11cd979f0558d1a30b Mon Sep 17 00:00:00 2001 From: Michal Sedlak Date: Mon, 5 Aug 2024 12:33:19 +0200 Subject: [PATCH 2/2] ci: replace EOL CentOS Stream 8 with Rocky Linux 8 --- .github/workflows/main.yml | 14 +++++++------- .github/workflows/packages.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 967e8fce..aae1e191 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: - 'debian:buster' - 'debian:bullseye' - 'debian:bookworm' - - 'quay.io/centos/centos:stream8' + - 'rockylinux:8' - 'oraclelinux:8' - 'oraclelinux:9' @@ -39,8 +39,8 @@ jobs: apt-get -y install librdkafka-dev env: DEBIAN_FRONTEND: noninteractive - - name: Enable additional repositories (CentOS Steam) - if: contains(matrix.image, 'centos:stream') + - name: Enable additional repositories (Rocky Linux) + if: contains(matrix.image, 'rockylinux') run: | dnf -y install 'dnf-command(config-manager)' dnf config-manager --set-enabled appstream powertools @@ -54,8 +54,8 @@ jobs: run: | dnf -y install 'dnf-command(config-manager)' dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder - - name: Enable EPEL (CentOS) - if: contains(matrix.image, 'centos') + - name: Enable EPEL (Rocky Linux) + if: contains(matrix.image, 'rockylinux') run: | yum -y install epel-release - name: Enable EPEL (Oracle Linux 8) @@ -66,8 +66,8 @@ jobs: if: contains(matrix.image, 'oraclelinux:9') run: | dnf -y install oracle-epel-release-el9 - - name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux) - if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux') + - name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux) + if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux') run: | yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel yum -y install zlib-devel pkgconfig librdkafka-devel diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 53dceebf..2d651c64 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -91,7 +91,7 @@ jobs: fail-fast: false matrix: image: - - 'quay.io/centos/centos:stream8' + - 'rockylinux:8' - 'oraclelinux:8' - 'oraclelinux:9' @@ -113,8 +113,8 @@ jobs: mkdir -p build/libfds_repo # Dependencies --------------------------------------------------------------------------- - - name: Enable additional repositories (CentOS Stream) - if: contains(matrix.image, 'centos:stream') + - name: Enable additional repositories (Rocky Linux) + if: contains(matrix.image, 'rockylinux') run: | dnf -y install 'dnf-command(config-manager)' dnf config-manager --set-enabled appstream powertools @@ -128,8 +128,8 @@ jobs: run: | dnf -y install 'dnf-command(config-manager)' dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder - - name: Enable EPEL (CentOS) - if: contains(matrix.image, 'centos') + - name: Enable EPEL (Rocky Linux) + if: contains(matrix.image, 'Rocky Linux') run: | yum -y install epel-release - name: Enable EPEL (Oracle Linux 8) @@ -140,8 +140,8 @@ jobs: if: contains(matrix.image, 'oraclelinux:9') run: | dnf -y install oracle-epel-release-el9 - - name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux) - if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux') + - name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux) + if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux') run: | yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel yum -y install zlib-devel pkgconfig rpm-build librdkafka-devel