From 26edb41c9b839a1f1d9d3a282366cb3b9f7fa1ae Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Tue, 18 Apr 2023 22:39:05 +0200
Subject: ci: Add CentOS Stream 9 and Rocky Linux 9

CentOS Stream 9 is the current development branch of CentOS and also
the upstream of Red Hat Enterprise Linux 9, where Rocky Linux 9 is a
1:1 RHEL clone/rebuild of RHEL 9 (like CentOS Linux was previously).

Closes: https://github.com/iputils/iputils/pull/457
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
---
 .github/workflows/ci.yml |  9 +++++++++
 ci/fedora.sh             | 19 ++++++++++---------
 ci/rockylinux.sh         |  1 +
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 120000 ci/rockylinux.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f20068c..45ba2e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,6 +62,14 @@ jobs:
             env:
               CC: clang
 
+          - container: "quay.io/centos/centos:stream9"
+            env:
+              CC: gcc
+
+          - container: "rockylinux:9"
+            env:
+              CC: gcc
+
           - container: "centos:7"
             env:
               CC: gcc
@@ -94,6 +102,7 @@ jobs:
       run: |
         export INSTALL=${{ matrix.container }}
         export DISTRO_VERSION="${INSTALL#*:}"
+        INSTALL="${INSTALL#quay.io/centos/}"
         INSTALL="${INSTALL%%:*}"
         INSTALL="${INSTALL%%/*}"
         ./ci/$INSTALL.sh
diff --git a/ci/fedora.sh b/ci/fedora.sh
index b7d29fe..314635b 100755
--- a/ci/fedora.sh
+++ b/ci/fedora.sh
@@ -4,6 +4,7 @@ set -ex
 
 yum -y install \
 	clang \
+	docbook5-style-xsl \
 	gcc \
 	gettext \
 	iproute \
@@ -12,18 +13,18 @@ yum -y install \
 	make \
 	pkg-config
 
-yum -y install libidn2-devel docbook5-style-xsl || true
-
-# supported since CentOS 7 (CentOS 6 don't have python 3.5 meson dependency)
-if [ "$(basename $0)" = "centos.sh" ]; then
-	# CentOS 7: provided by epel
+if [ "$(basename $0)" = "centos.sh" ] || [ "$(basename $0)" = "rockylinux.sh" ]; then
+	# CentOS Linux 7: libidn2-devel, meson, ninja-build are provided by EPEL
 	yum -y install epel-release
 
-	# CentOS >= 8 provided by PowerTools (but epel still needed)
+	# Enable CRB (formerly PowerTools) on CentOS/RHEL/Rocky >= 8 via EPEL
+	# CentOS/RHEL/Rocky >= 8: meson and ninja-build are provided by CRB
 	if [ "$DISTRO_VERSION" != 7 ]; then
-		yum -y install dnf-plugins-core
-		yum config-manager --set-enabled powertools
+		# Update epel-release because CentOS Stream 9 ships 9-2.el9,
+		# which is unfortunately too old to provide the crb command.
+		dnf -y install 'dnf-command(config-manager)' epel-release
+		crb enable
 	fi
 fi
 
-yum -y install meson ninja-build
+yum -y install libidn2-devel meson ninja-build
diff --git a/ci/rockylinux.sh b/ci/rockylinux.sh
new file mode 120000
index 0000000..1479a43
--- /dev/null
+++ b/ci/rockylinux.sh
@@ -0,0 +1 @@
+fedora.sh
\ No newline at end of file
-- 
cgit v1.2.1