diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4be1b9..a348f26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,8 +63,7 @@ jobs: - debian:stretch - centos:centos8 - centos:centos7 - - fedora:32 - - fedora:31 + - fedora:34 - opensuse/leap:15 container: diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh index b776056..ba90028 100755 --- a/.github/workflows/linux-ci-helper.sh +++ b/.github/workflows/linux-ci-helper.sh @@ -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"