From 09cf8b5ffc4b44cd599a3ce8bfc978f54458d0f0 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sat, 11 May 2024 19:08:01 +0900 Subject: [PATCH] Upgrade CI to Ubuntu 24.04 LTS --- .github/workflows/ci.yml | 2 +- .github/workflows/linux-ci-helper.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 367ec6d20..73c463162 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: # matrix: container: - - ubuntu:23.10 + - ubuntu:24.04 - ubuntu:22.04 - ubuntu:20.04 - debian:bookworm diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh index 5ba159eaf..f72248f41 100755 --- a/.github/workflows/linux-ci-helper.sh +++ b/.github/workflows/linux-ci-helper.sh @@ -80,12 +80,12 @@ PACKAGE_INSTALL_ADDITIONAL_OPTIONS="" SHELLCHECK_DIRECT_INSTALL=0 AWSCLI_DIRECT_INSTALL=1 -if [ "${CONTAINER_FULLNAME}" = "ubuntu:23.10" ]; then +if [ "${CONTAINER_FULLNAME}" = "ubuntu:24.04" ]; then PACKAGE_MANAGER_BIN="apt-get" PACKAGE_UPDATE_OPTIONS="update -y -qq" PACKAGE_INSTALL_OPTIONS="install -y" - INSTALL_PACKAGES="autoconf autotools-dev clang-tidy openjdk-21-jre-headless fuse jq libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr curl python3-pip unzip" + INSTALL_PACKAGES="autoconf autotools-dev clang-tidy openjdk-21-jre-headless fuse jq libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mailcap libtool pkg-config libssl-dev attr curl python3-pip unzip" INSTALL_CHECKER_PKGS="cppcheck shellcheck" INSTALL_CHECKER_PKG_OPTIONS=""