From 7bf4ca1837f89986909a8285b6a8d0e8435ef76f Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 14 May 2023 13:41:12 +0900 Subject: [PATCH] Add Fedora 38 and remove 36 from CI (#2160) --- .github/workflows/ci.yml | 2 +- .github/workflows/linux-ci-helper.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b3c04d..146a343 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,8 +58,8 @@ jobs: - rockylinux:9 - rockylinux:8 - centos:centos7 + - fedora:38 - fedora:37 - - fedora:36 - opensuse/leap:15 - alpine:3.17 diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh index 19ffc18..1bbb5fa 100755 --- a/.github/workflows/linux-ci-helper.sh +++ b/.github/workflows/linux-ci-helper.sh @@ -183,7 +183,7 @@ elif [ "${CONTAINER_FULLNAME}" = "centos:centos7" ]; then INSTALL_CHECKER_PKGS="cppcheck" INSTALL_CHECKER_PKG_OPTIONS="--enablerepo=epel" -elif [ "${CONTAINER_FULLNAME}" = "fedora:37" ]; then +elif [ "${CONTAINER_FULLNAME}" = "fedora:38" ]; then PACKAGE_MANAGER_BIN="dnf" PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_INSTALL_OPTIONS="install -y" @@ -193,7 +193,7 @@ elif [ "${CONTAINER_FULLNAME}" = "fedora:37" ]; then INSTALL_CHECKER_PKGS="cppcheck ShellCheck" INSTALL_CHECKER_PKG_OPTIONS="" -elif [ "${CONTAINER_FULLNAME}" = "fedora:36" ]; then +elif [ "${CONTAINER_FULLNAME}" = "fedora:37" ]; then PACKAGE_MANAGER_BIN="dnf" PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_INSTALL_OPTIONS="install -y"