From 9d828ae069187ac0a01ecd56a5f4ad3a2220b03c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 24 Apr 2025 20:03:02 +1000
Subject: [PATCH] CI: bump to Ubuntu 24.04

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1194>
---
 .gitlab-ci.yml        | 14 +++++++-------
 .gitlab-ci/config.yml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27439ba4..7d2ad111 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -260,14 +260,14 @@ debian:stable@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:22.04@container-prep:
+ubuntu:24.04@container-prep:
   extends:
     - .fdo.container-build@ubuntu
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '22.04'
+    FDO_DISTRIBUTION_VERSION: '24.04'
     FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
@@ -368,14 +368,14 @@ debian:stable@container-clean:
     FDO_DISTRIBUTION_VERSION: 'stable'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:22.04@container-clean:
+ubuntu:24.04@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '22.04'
+    FDO_DISTRIBUTION_VERSION: '24.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
 arch:rolling@container-clean:
@@ -1131,16 +1131,16 @@ debian:stable@default-build:
     - "debian:stable@container-prep"
 
 
-ubuntu:22.04@default-build:
+ubuntu:24.04@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_VERSION: '22.04'
+    FDO_DISTRIBUTION_VERSION: '24.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
   needs:
-    - "ubuntu:22.04@container-prep"
+    - "ubuntu:24.04@container-prep"
 
 
 arch:rolling@default-build:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index f8fb7988..40fa1dab 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -77,7 +77,7 @@ distributions:
   - name: ubuntu
     tag: *default_tag
     versions:
-      - '22.04'
+      - '24.04'
     packages:
       - git
       - gcc