Update CI runners to Fedora 36 and Ubuntu 22.04 (#1965)

Also remove Debian stretch which is no longer supported by LTS.
This commit is contained in:
Andrew Gaul 2022-06-22 17:40:08 +09:00 committed by GitHub
parent b52f916af6
commit a282cb7a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions

View File

@ -50,15 +50,14 @@ jobs:
# #
matrix: matrix:
container: container:
- ubuntu:21.10 - ubuntu:22.04
- ubuntu:20.04 - ubuntu:20.04
- ubuntu:18.04 - ubuntu:18.04
- debian:bullseye - debian:bullseye
- debian:buster - debian:buster
- debian:stretch
- rockylinux:8 - rockylinux:8
- centos:centos7 - centos:centos7
- fedora:35 - fedora:36
- opensuse/leap:15 - opensuse/leap:15
container: container:

View File

@ -64,7 +64,7 @@ CONFIGURE_OPTIONS="CXXFLAGS='-O -std=c++03 -DS3FS_PTHREAD_ERRORCHECK=1' --prefix
#----------------------------------------------------------- #-----------------------------------------------------------
# OS dependent variables # OS dependent variables
#----------------------------------------------------------- #-----------------------------------------------------------
if [ "${CONTAINER_FULLNAME}" = "ubuntu:21.10" ]; then if [ "${CONTAINER_FULLNAME}" = "ubuntu:22.04" ]; then
PACKAGE_MANAGER_BIN="apt-get" PACKAGE_MANAGER_BIN="apt-get"
PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_UPDATE_OPTIONS="update -y -qq"
@ -112,14 +112,6 @@ elif [ "${CONTAINER_FULLNAME}" = "debian:buster" ]; then
INSTALL_CHECKER_PKGS="cppcheck shellcheck" INSTALL_CHECKER_PKGS="cppcheck shellcheck"
INSTALL_CHECKER_PKG_OPTIONS="" INSTALL_CHECKER_PKG_OPTIONS=""
elif [ "${CONTAINER_FULLNAME}" = "debian:stretch" ]; then
PACKAGE_MANAGER_BIN="apt-get"
PACKAGE_UPDATE_OPTIONS="update -y -qq"
INSTALL_PACKAGES="autoconf autotools-dev default-jre-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr curl procps python3-pip unzip"
INSTALL_CHECKER_PKGS="cppcheck shellcheck"
INSTALL_CHECKER_PKG_OPTIONS=""
elif [ "${CONTAINER_FULLNAME}" = "rockylinux:8" ]; then elif [ "${CONTAINER_FULLNAME}" = "rockylinux:8" ]; then
PACKAGE_MANAGER_BIN="dnf" PACKAGE_MANAGER_BIN="dnf"
PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_UPDATE_OPTIONS="update -y -qq"
@ -145,7 +137,7 @@ elif [ "${CONTAINER_FULLNAME}" = "centos:centos7" ]; then
INSTALL_CHECKER_PKGS="cppcheck" INSTALL_CHECKER_PKGS="cppcheck"
INSTALL_CHECKER_PKG_OPTIONS="--enablerepo=epel" INSTALL_CHECKER_PKG_OPTIONS="--enablerepo=epel"
elif [ "${CONTAINER_FULLNAME}" = "fedora:35" ]; then elif [ "${CONTAINER_FULLNAME}" = "fedora:36" ]; then
PACKAGE_MANAGER_BIN="dnf" PACKAGE_MANAGER_BIN="dnf"
PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_UPDATE_OPTIONS="update -y -qq"