Skip to content

Commit 8bfa734

Browse files
authored
Merge pull request #100 from CESNET/fix-ci-change-centos-to-rockylinux
ci: change centos to rockylinux
2 parents 10833f2 + dee93d7 commit 8bfa734

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- 'debian:buster'
2222
- 'debian:bullseye'
2323
- 'debian:bookworm'
24-
- 'quay.io/centos/centos:stream8'
24+
- 'rockylinux:8'
2525
- 'oraclelinux:8'
2626
- 'oraclelinux:9'
2727

@@ -39,8 +39,8 @@ jobs:
3939
apt-get -y install librdkafka-dev
4040
env:
4141
DEBIAN_FRONTEND: noninteractive
42-
- name: Enable additional repositories (CentOS Steam)
43-
if: contains(matrix.image, 'centos:stream')
42+
- name: Enable additional repositories (Rocky Linux)
43+
if: contains(matrix.image, 'rockylinux')
4444
run: |
4545
dnf -y install 'dnf-command(config-manager)'
4646
dnf config-manager --set-enabled appstream powertools
@@ -54,8 +54,8 @@ jobs:
5454
run: |
5555
dnf -y install 'dnf-command(config-manager)'
5656
dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
57-
- name: Enable EPEL (CentOS)
58-
if: contains(matrix.image, 'centos')
57+
- name: Enable EPEL (Rocky Linux)
58+
if: contains(matrix.image, 'rockylinux')
5959
run: |
6060
yum -y install epel-release
6161
- name: Enable EPEL (Oracle Linux 8)
@@ -66,8 +66,8 @@ jobs:
6666
if: contains(matrix.image, 'oraclelinux:9')
6767
run: |
6868
dnf -y install oracle-epel-release-el9
69-
- name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux)
70-
if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux')
69+
- name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
70+
if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
7171
run: |
7272
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel
7373
yum -y install zlib-devel pkgconfig librdkafka-devel
@@ -95,10 +95,8 @@ jobs:
9595
- name: Build and install IPFIXcol2
9696
run: |
9797
mkdir build && cd build
98-
cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=$TESTS
98+
cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=1
9999
make && make install
100-
env:
101-
TESTS: ${{ startsWith(matrix.image, 'centos:7') != true }}
102100
- name: Run tests
103101
run: cd build && make test
104102
- name: Try to run IPFIXcol2

.github/workflows/packages.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
fail-fast: false
9292
matrix:
9393
image:
94-
- 'quay.io/centos/centos:stream8'
94+
- 'rockylinux:8'
9595
- 'oraclelinux:8'
9696
- 'oraclelinux:9'
9797

@@ -113,8 +113,8 @@ jobs:
113113
mkdir -p build/libfds_repo
114114
115115
# Dependencies ---------------------------------------------------------------------------
116-
- name: Enable additional repositories (CentOS Stream)
117-
if: contains(matrix.image, 'centos:stream')
116+
- name: Enable additional repositories (Rocky Linux)
117+
if: contains(matrix.image, 'rockylinux')
118118
run: |
119119
dnf -y install 'dnf-command(config-manager)'
120120
dnf config-manager --set-enabled appstream powertools
@@ -128,8 +128,8 @@ jobs:
128128
run: |
129129
dnf -y install 'dnf-command(config-manager)'
130130
dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
131-
- name: Enable EPEL (CentOS)
132-
if: contains(matrix.image, 'centos')
131+
- name: Enable EPEL (Rocky Linux)
132+
if: contains(matrix.image, 'Rocky Linux')
133133
run: |
134134
yum -y install epel-release
135135
- name: Enable EPEL (Oracle Linux 8)
@@ -140,8 +140,8 @@ jobs:
140140
if: contains(matrix.image, 'oraclelinux:9')
141141
run: |
142142
dnf -y install oracle-epel-release-el9
143-
- name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux)
144-
if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux')
143+
- name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
144+
if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
145145
run: |
146146
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel
147147
yum -y install zlib-devel pkgconfig rpm-build librdkafka-devel

0 commit comments

Comments
 (0)