From 7928bf1853478ef6dfd0429611d734eb64efb6d4 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Tue, 14 Jan 2025 09:38:23 +0900 Subject: [PATCH] Use AlmaLinux and RockyLinux Signed-off-by: Shizuo Fujita --- .github/workflows/yum.yml | 14 +++++++------- ci/yum-test.sh | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/yum.yml b/.github/workflows/yum.yml index 2da8dad..53326c2 100644 --- a/.github/workflows/yum.yml +++ b/.github/workflows/yum.yml @@ -9,16 +9,16 @@ jobs: fail-fast: false matrix: label: - - CentOS 7 x86_64 - - CentOS 8 x86_64 + - RockyLinux 8 x86_64 + - AlmaLinux 9 x86_64 - Fedora 33 x86_64 - AmazonLinux 2 x86_64 include: - - label: CentOS 7 x86_64 - test-docker-image: centos:7 + - label: RockyLinux 8 x86_64 + test-docker-image: rockylinux:8 test-script: ci/yum-test.sh - - label: CentOS 8 x86_64 - test-docker-image: centos:8 + - label: AlmaLinux 9 x86_64 + test-docker-image: almalinux:9 test-script: ci/yum-test.sh - label: Fedora 33 x86_64 test-docker-image: fedora:33 @@ -36,4 +36,4 @@ jobs: --tty \ --volume ${PWD}:/capng \ ${{ matrix.test-docker-image }} \ - /capng/${{ matrix.test-script }} \ No newline at end of file + /capng/${{ matrix.test-script }} diff --git a/ci/yum-test.sh b/ci/yum-test.sh index fa1f791..c7caafe 100755 --- a/ci/yum-test.sh +++ b/ci/yum-test.sh @@ -34,6 +34,12 @@ case ${distribution} in ;; esac ;; + rocky) + DNF="dnf --enablerepo=powertools" + ;; + almalinux) + DNF="dnf --enablerepo=crb" + ;; esac ${DNF} groupinstall -y "Development Tools"