From e014d6e646e02e19660555b04f6ffa884ae11504 Mon Sep 17 00:00:00 2001
From: Takeshi Nakatani <ggtakec@gmail.com>
Date: Sun, 20 Feb 2022 02:46:01 +0000
Subject: [PATCH] Changed Rocky Linux 8 instead of CentOS 8

---
 .github/workflows/ci.yml             |  2 +-
 .github/workflows/linux-ci-helper.sh | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca82b11..fcf7db6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
           - debian:bullseye
           - debian:buster
           - debian:stretch
-          - centos:centos8
+          - rockylinux:8
           - centos:centos7
           - fedora:35
           - opensuse/leap:15
diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh
index 3267e50..0cb7463 100755
--- a/.github/workflows/linux-ci-helper.sh
+++ b/.github/workflows/linux-ci-helper.sh
@@ -117,24 +117,13 @@ elif [ "${CONTAINER_FULLNAME}" = "debian:stretch" ]; then
     INSTALL_CHECKER_PKGS="cppcheck shellcheck"
     INSTALL_CHECKER_PKG_OPTIONS=""
 
-elif [ "${CONTAINER_FULLNAME}" = "centos:centos8" ]; then
+elif [ "${CONTAINER_FULLNAME}" = "rockylinux:8" ]; then
     PACKAGE_MANAGER_BIN="dnf"
     PACKAGE_UPDATE_OPTIONS="update -y -qq"
 
-    # [NOTE] 2022-02-11
-    # We are receiving the following error on Github Actions:
-    #   "Failed to download metadata for repo 'appstream':"
-    # We should proceed with the migration to CentOS9, but we will fix it temporarily.
-    #
-    sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-*
-    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-*
-    "${PACKAGE_MANAGER_BIN}" update -y
-    "${PACKAGE_MANAGER_BIN}" --disablerepo '*' --enablerepo extras swap centos-linux-repos centos-stream-repos -y
-    "${PACKAGE_MANAGER_BIN}" distro-sync -y
-
     # [NOTE]
-    # Installing ShellCheck on CentOS 8 is not easy.
-    # Give up to run ShellCheck on CentOS 8 as we don't have to run ShellChek on all operating systems.
+    # Installing ShellCheck on Rocky Linux is not easy.
+    # Give up to run ShellCheck on Rocky Linux as we don't have to run ShellChek on all operating systems.
     #
     INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk-headless libxml2-devel mailcap git automake make openssl-devel attr diffutils curl python3"
     INSTALL_CHECKER_PKGS="cppcheck"