CI: bump to Ubuntu 24.04

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1194>
This commit is contained in:
Peter Hutterer 2025-04-24 20:03:02 +10:00
parent 04a55d59d9
commit 9d828ae069
2 changed files with 8 additions and 8 deletions

View file

@ -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:

View file

@ -77,7 +77,7 @@ distributions:
- name: ubuntu
tag: *default_tag
versions:
- '22.04'
- '24.04'
packages:
- git
- gcc