Skip to content

Commit 5c608f6

Browse files
author
Lukas Hutak
committed
CI: replace CentOS 8 with CentOS 8 Stream
CentOS 8 is not supported by Red Hat anymore and its repositories are broken.
1 parent dbcf0fd commit 5c608f6

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
image: ['ubuntu:18.04', 'ubuntu:20.04', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'centos:7', 'centos:8']
18+
image:
19+
- 'ubuntu:18.04'
20+
- 'ubuntu:20.04'
21+
- 'debian:stretch'
22+
- 'debian:buster'
23+
- 'debian:bullseye'
24+
- 'centos:7'
25+
- 'quay.io/centos/centos:stream8'
1926

2027
name: Build on ${{ matrix.image }}
2128
container: ${{ matrix.image }}
@@ -32,13 +39,13 @@ jobs:
3239
apt-get -y install librdkafka-dev
3340
env:
3441
DEBIAN_FRONTEND: noninteractive
35-
- name: Enable additional repositories (CentOS 8)
36-
if: startsWith(matrix.image, 'centos:8')
42+
- name: Enable additional repositories (CentOS Steam)
43+
if: contains(matrix.image, 'centos:stream')
3744
run: |
3845
dnf -y install 'dnf-command(config-manager)'
3946
dnf config-manager --set-enabled appstream powertools
4047
- name: Install dependencies for libfds and IPFIXcol2 (CentOS)
41-
if: startsWith(matrix.image, 'centos')
48+
if: contains(matrix.image, 'centos')
4249
run: |
4350
yum -y install epel-release
4451
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel

.github/workflows/packages.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ jobs:
9090
strategy:
9191
fail-fast: false
9292
matrix:
93-
image: ['centos:7', 'centos:8']
93+
image:
94+
- 'centos:7'
95+
- 'quay.io/centos/centos:stream8'
9496

9597
name: Build RPMs on ${{ matrix.image }}
9698
container: ${{ matrix.image }}
@@ -111,13 +113,13 @@ jobs:
111113
mkdir -p build/libfds_repo
112114
113115
# Dependencies ---------------------------------------------------------------------------
114-
- name: Enable additional repositories (CentOS 8)
115-
if: startsWith(matrix.image, 'centos:8')
116+
- name: Enable additional repositories (CentOS Stream)
117+
if: contains(matrix.image, 'centos:stream')
116118
run: |
117119
dnf -y install 'dnf-command(config-manager)'
118120
dnf config-manager --set-enabled appstream powertools
119121
- name: Install dependencies for libfds and IPFIXcol2 (CentOS)
120-
if: startsWith(matrix.image, 'centos')
122+
if: contains(matrix.image, 'centos')
121123
run: |
122124
yum -y install epel-release
123125
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel

0 commit comments

Comments
 (0)