Add Ubuntu 23.04 and remove 18.04

18.04 is EOL:

https://ubuntu.com/blog/ubuntu-18-04-eol-for-devices

This removes a FUSE 3 blocker.  References #1159.
This commit is contained in:
Andrew Gaul 2023-05-14 12:40:07 +09:00
parent 7e8238abc0
commit e86e6cf24f
2 changed files with 11 additions and 2 deletions

View File

@ -50,9 +50,9 @@ jobs:
# #
matrix: matrix:
container: container:
- ubuntu:23.04
- ubuntu:22.04 - ubuntu:22.04
- ubuntu:20.04 - ubuntu:20.04
- ubuntu:18.04
- debian:bullseye - debian:bullseye
- debian:buster - debian:buster
- rockylinux:9 - rockylinux:9

View File

@ -80,7 +80,16 @@ PACKAGE_INSTALL_ADDITIONAL_OPTIONS=""
SHELLCHECK_DIRECT_INSTALL=0 SHELLCHECK_DIRECT_INSTALL=0
AWSCLI_DIRECT_INSTALL=1 AWSCLI_DIRECT_INSTALL=1
if [ "${CONTAINER_FULLNAME}" = "ubuntu:22.04" ]; then if [ "${CONTAINER_FULLNAME}" = "ubuntu:23.04" ]; then
PACKAGE_MANAGER_BIN="apt-get"
PACKAGE_UPDATE_OPTIONS="update -y -qq"
PACKAGE_INSTALL_OPTIONS="install -y"
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 python3-pip unzip"
INSTALL_CHECKER_PKGS="cppcheck shellcheck"
INSTALL_CHECKER_PKG_OPTIONS=""
elif [ "${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"
PACKAGE_INSTALL_OPTIONS="install -y" PACKAGE_INSTALL_OPTIONS="install -y"