From a40004f9cce257fad2497774743a743f5d7419c6 Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Wed, 4 Jan 2023 22:18:28 +0900 Subject: [PATCH] Fixed a conflict between curl and curl-minimal on RockyLinux 9 (#2086) --- .github/workflows/linux-ci-helper.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh index 3f8f6b7..df27d75 100755 --- a/.github/workflows/linux-ci-helper.sh +++ b/.github/workflows/linux-ci-helper.sh @@ -68,6 +68,7 @@ CONFIGURE_OPTIONS="CXXFLAGS='-O -std=c++03 -DS3FS_PTHREAD_ERRORCHECK=1' --prefix # Default values # PACKAGE_ENABLE_REPO_OPTIONS="" +PACKAGE_INSTALL_ADDITIONAL_OPTIONS="" SHELLCHECK_DIRECT_INSTALL=0 if [ "${CONTAINER_FULLNAME}" = "ubuntu:22.04" ]; then @@ -123,6 +124,12 @@ elif [ "${CONTAINER_FULLNAME}" = "rockylinux:9" ]; then PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_ENABLE_REPO_OPTIONS="--enablerepo=crb" + # [NOTE] + # Rocky Linux 9 (or CentOS Stream 9) images may have curl installation issues that + # conflict with the curl-minimal package. + # + PACKAGE_INSTALL_ADDITIONAL_OPTIONS="--allowerasing" + 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 procps unzip xz https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" INSTALL_CHECKER_PKGS="cppcheck" INSTALL_CHECKER_PKG_OPTIONS="--enablerepo=epel" @@ -202,7 +209,7 @@ echo "${PRGNAME} [INFO] Updates." # Install packages ( with cppcheck ) # echo "${PRGNAME} [INFO] Install packages." -/bin/sh -c "${PACKAGE_MANAGER_BIN} ${PACKAGE_ENABLE_REPO_OPTIONS} install -y ${INSTALL_PACKAGES}" +/bin/sh -c "${PACKAGE_MANAGER_BIN} ${PACKAGE_ENABLE_REPO_OPTIONS} install -y ${PACKAGE_INSTALL_ADDITIONAL_OPTIONS} ${INSTALL_PACKAGES}" echo "${PRGNAME} [INFO] Install cppcheck package." /bin/sh -c "${PACKAGE_MANAGER_BIN} ${INSTALL_CHECKER_PKG_OPTIONS} install -y ${INSTALL_CHECKER_PKGS}"