youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deduplicate CentOS 9 and 10 (#2718)

Browse Source 
EPEL is no longer required.
This commit is contained in:
Andrew Gaul
2025-08-30 23:56:49 +09:00
committed by GitHub
parent f1e836c725
commit eaa2a90a56
1 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
.github/workflows/linux-ci-helper.sh vendored
View File

@ -189,14 +189,15 @@ elif [ "${CONTAINER_FULLNAME}" = "debian:bookworm" ] ||
CURL_DIRECT_INSTALL=1 CURL_DIRECT_INSTALL=1
elif [ "${CONTAINER_FULLNAME}" = "rockylinux/rockylinux:10" ]; then elif [ "${CONTAINER_FULLNAME}" = "rockylinux/rockylinux:10" ] ||
[ "${CONTAINER_FULLNAME}" = "rockylinux:9" ]; then
PACKAGE_MANAGER_BIN="dnf" PACKAGE_MANAGER_BIN="dnf"
PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_UPDATE_OPTIONS="update -y -qq"
PACKAGE_INSTALL_OPTIONS="install -y" PACKAGE_INSTALL_OPTIONS="install -y"
PACKAGE_ENABLE_REPO_OPTIONS="--enablerepo=crb" PACKAGE_ENABLE_REPO_OPTIONS="--enablerepo=crb"
# [NOTE] # [NOTE]
# Rocky Linux 10 (or CentOS Stream 10) images may have curl installation issues that # Rocky Linux 9/10 (or CentOS Stream 9/10) images may have curl installation issues that
# conflict with the curl-minimal package. # conflict with the curl-minimal package.
# #
PACKAGE_INSTALL_ADDITIONAL_OPTIONS="--allowerasing" PACKAGE_INSTALL_ADDITIONAL_OPTIONS="--allowerasing"
@ -224,45 +225,6 @@ elif [ "${CONTAINER_FULLNAME}" = "rockylinux/rockylinux:10" ]; then
perl-Test-Harness perl-Test-Harness
procps procps
xz xz
https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
)
elif [ "${CONTAINER_FULLNAME}" = "rockylinux:9" ]; then
PACKAGE_MANAGER_BIN="dnf"
PACKAGE_UPDATE_OPTIONS="update -y -qq"
PACKAGE_INSTALL_OPTIONS="install -y"
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=(
attr
automake
curl
curl-devel
diffutils
fuse
fuse-devel
gcc
gcc-c++
git
glibc-langpack-en
java-21-openjdk-headless
jq
libstdc++-devel
libxml2-devel
mailcap
make
openssl
openssl-devel
perl-Test-Harness
procps
xz
https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
) )
CURL_DIRECT_INSTALL=1 CURL_DIRECT_INSTALL=1