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 s3fs-fuse#1159.
gaul · May 14, 2023 · 148e5a5 · 148e5a5
1 parent 59c3b26
commit 148e5a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,9 +50,9 @@ jobs:
       #
       matrix:
         container:
+          - ubuntu:23.04
           - ubuntu:22.04
           - ubuntu:20.04
-          - ubuntu:18.04
           - debian:bullseye
           - debian:buster
           - rockylinux:9

diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh
@@ -80,7 +80,7 @@ PACKAGE_INSTALL_ADDITIONAL_OPTIONS=""
 SHELLCHECK_DIRECT_INSTALL=0
 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"
@@ -89,7 +89,7 @@ if [ "${CONTAINER_FULLNAME}" = "ubuntu:22.04" ]; then
     INSTALL_CHECKER_PKGS="cppcheck shellcheck"
     INSTALL_CHECKER_PKG_OPTIONS=""
 
-elif [ "${CONTAINER_FULLNAME}" = "ubuntu:20.04" ]; then
+elif [ "${CONTAINER_FULLNAME}" = "ubuntu:22.04" ]; then
     PACKAGE_MANAGER_BIN="apt-get"
     PACKAGE_UPDATE_OPTIONS="update -y -qq"
     PACKAGE_INSTALL_OPTIONS="install -y"
@@ -98,7 +98,7 @@ elif [ "${CONTAINER_FULLNAME}" = "ubuntu:20.04" ]; then
     INSTALL_CHECKER_PKGS="cppcheck shellcheck"
     INSTALL_CHECKER_PKG_OPTIONS=""
 
-elif [ "${CONTAINER_FULLNAME}" = "ubuntu:18.04" ]; then
+elif [ "${CONTAINER_FULLNAME}" = "ubuntu:20.04" ]; then
     PACKAGE_MANAGER_BIN="apt-get"
     PACKAGE_UPDATE_OPTIONS="update -y -qq"
     PACKAGE_INSTALL_OPTIONS="install -y"