From c03b682f1945fdd356260b1965bf232108a084d5 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 10 May 2024 10:22:59 -0700 Subject: [PATCH] CI: Replace Ubuntu 23.10 with Ubuntu 24.04 --- .cirrus.yml | 6 +++--- ci/{ubuntu-23.10 => ubuntu-24.04}/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename ci/{ubuntu-23.10 => ubuntu-24.04}/Dockerfile (89%) diff --git a/.cirrus.yml b/.cirrus.yml index 249dfe00..063bac16 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -127,10 +127,10 @@ opensuse_tumbleweed_task: << : *CI_TEMPLATE << : *UNIX_ENV -ubuntu23_task: +ubuntu24_task: container: - # Ubuntu 23.10 EOL: July 2024 - dockerfile: ci/ubuntu-23.10/Dockerfile + # Ubuntu 24.04 EOL: Jun 2029 + dockerfile: ci/ubuntu-24.04/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *UNIX_ENV diff --git a/ci/ubuntu-23.10/Dockerfile b/ci/ubuntu-24.04/Dockerfile similarity index 89% rename from ci/ubuntu-23.10/Dockerfile rename to ci/ubuntu-24.04/Dockerfile index 47c16ca6..00dc4b33 100644 --- a/ci/ubuntu-23.10/Dockerfile +++ b/ci/ubuntu-24.04/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:23.10 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" # A version field to invalidate Cirrus's build cache when needed, as suggested in # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 -ENV DOCKERFILE_VERSION 20231213 +ENV DOCKERFILE_VERSION 20240510 RUN apt-get update && apt-get -y install \ cmake \