Update CI to latest Fedora version (#1641)

This commit is contained in:
Andrew Gaul 2021-04-30 20:29:28 +09:00 committed by GitHub
parent 771bbfeac5
commit 1dabfbe1da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions

View File

@ -63,8 +63,7 @@ jobs:
- debian:stretch
- centos:centos8
- centos:centos7
- fedora:32
- fedora:31
- fedora:34
- opensuse/leap:15
container:

View File

@ -124,7 +124,7 @@ elif [ "${CONTAINER_FULLNAME}" = "centos:centos7" ]; then
#
CONFIGURE_OPTIONS="CXXFLAGS='-O2 -std=c++11 -DS3FS_PTHREAD_ERRORCHECK=1' --prefix=/usr --with-openssl"
elif [ "${CONTAINER_FULLNAME}" = "fedora:32" ]; then
elif [ "${CONTAINER_FULLNAME}" = "fedora:34" ]; then
PACKAGE_MANAGER_BIN="dnf"
PACKAGE_UPDATE_OPTIONS="update -y -qq"
@ -132,14 +132,6 @@ elif [ "${CONTAINER_FULLNAME}" = "fedora:32" ]; then
INSTALL_CPPCHECK_OPTIONS=""
INSTALL_JDK_PACKAGES="java-1.8.0-openjdk"
elif [ "${CONTAINER_FULLNAME}" = "fedora:31" ]; then
PACKAGE_MANAGER_BIN="dnf"
PACKAGE_UPDATE_OPTIONS="update -y -qq"
INSTALL_PACKAGES="gcc libstdc++-devel gcc-c++ fuse fuse-devel curl-devel libxml2-devel mailcap git automake make openssl-devel wget attr python2 procps"
INSTALL_CPPCHECK_OPTIONS=""
INSTALL_JDK_PACKAGES="java-1.8.0-openjdk"
elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then
PACKAGE_MANAGER_BIN="zypper"
PACKAGE_UPDATE_OPTIONS="refresh"