CI: bump to Fedora 43 and Ubuntu 25.10

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1355>
This commit is contained in:
Peter Hutterer 2025-11-04 10:17:05 +10:00 committed by Marge Bot
parent 9b37ffd340
commit 9c78f989fb
2 changed files with 90 additions and 90 deletions

View file

@ -110,12 +110,12 @@ variables:
# changing these will force rebuilding the associated image # changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular # Note: these tags have no meaning and are not tied to a particular
# libinput version # libinput version
FEDORA_TAG: '2025-08-01.0' FEDORA_TAG: '2025-11-04.0'
DEBIAN_TAG: '2025-08-01.0' DEBIAN_TAG: '2025-11-04.0'
UBUNTU_TAG: '2025-08-01.0' UBUNTU_TAG: '2025-11-04.0'
ARCH_TAG: '2025-08-01.0' ARCH_TAG: '2025-11-04.0'
ALPINE_TAG: '2025-08-01.0' ALPINE_TAG: '2025-11-04.0'
FREEBSD_TAG: '2025-08-01.0' FREEBSD_TAG: '2025-11-04.0'
FDO_UPSTREAM_REPO: libinput/libinput FDO_UPSTREAM_REPO: libinput/libinput
@ -267,18 +267,6 @@ pre-commit-hooks:
# # # #
################################################################# #################################################################
fedora:41@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
- .fdo-runner-tags
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:42@container-prep: fedora:42@container-prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
@ -291,6 +279,18 @@ fedora:42@container-prep:
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:43@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
- .fdo-runner-tags
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '43'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-prep: debian:stable@container-prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
@ -303,7 +303,7 @@ debian:stable@container-prep:
FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
ubuntu:25.04@container-prep: ubuntu:25.10@container-prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
- .policy - .policy
@ -311,7 +311,7 @@ ubuntu:25.04@container-prep:
stage: prep stage: prep
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '25.04' FDO_DISTRIBUTION_VERSION: '25.10'
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
@ -386,16 +386,6 @@ freebsd:14.2@container-prep:
only: only:
- schedules - schedules
fedora:41@container-clean:
extends:
- .policy
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:42@container-clean: fedora:42@container-clean:
extends: extends:
- .policy - .policy
@ -406,6 +396,16 @@ fedora:42@container-clean:
FDO_DISTRIBUTION_VERSION: '42' FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:43@container-clean:
extends:
- .policy
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '43'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-clean: debian:stable@container-clean:
extends: extends:
- .policy - .policy
@ -416,14 +416,14 @@ debian:stable@container-clean:
FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_VERSION: 'stable'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
ubuntu:25.04@container-clean: ubuntu:25.10@container-clean:
extends: extends:
- .policy - .policy
- .container-clean - .container-clean
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '25.04' FDO_DISTRIBUTION_VERSION: '25.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
arch:rolling@container-clean: arch:rolling@container-clean:
@ -577,20 +577,20 @@ freebsd:14.2@container-clean:
- export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES" - export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES"
.fedora:42@test-suite-vm: .fedora:43@test-suite-vm:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .test-suite-vm - .test-suite-vm
variables: variables:
FDO_DISTRIBUTION_VERSION: 42 FDO_DISTRIBUTION_VERSION: 43
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:42@container-prep" - "fedora:43@container-prep"
vm-touchpad: vm-touchpad:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad' SUITE_NAMES: 'touchpad'
@ -603,7 +603,7 @@ vm-touchpad-no-libwacom:
vm-touchpad_palm: vm-touchpad_palm:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad_palm' SUITE_NAMES: 'touchpad_palm'
@ -616,7 +616,7 @@ vm-touchpad_palm-no-libwacom:
vm-touchpad_dwt: vm-touchpad_dwt:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad_dwt' SUITE_NAMES: 'touchpad_dwt'
@ -629,7 +629,7 @@ vm-touchpad_dwt-no-libwacom:
vm-tap: vm-tap:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad_tap' SUITE_NAMES: 'touchpad_tap'
@ -642,7 +642,7 @@ vm-tap-no-libwacom:
vm-tap-drag: vm-tap-drag:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad_tap_drag' SUITE_NAMES: 'touchpad_tap_drag'
@ -655,7 +655,7 @@ vm-tap-drag-no-libwacom:
vm-tap-palm: vm-tap-palm:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad_tap_palm' SUITE_NAMES: 'touchpad_tap_palm'
@ -668,7 +668,7 @@ vm-tap-palm-no-libwacom:
vm-touchpad-buttons: vm-touchpad-buttons:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad_buttons' SUITE_NAMES: 'touchpad_buttons'
@ -681,7 +681,7 @@ vm-touchpad-buttons-no-libwacom:
vm-tablet: vm-tablet:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet' SUITE_NAMES: 'tablet'
@ -694,7 +694,7 @@ vm-tablet-no-libwacom:
vm-tablet_left_handed: vm-tablet_left_handed:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet_left_handed' SUITE_NAMES: 'tablet_left_handed'
@ -707,7 +707,7 @@ vm-tablet_left_handed-no-libwacom:
vm-tablet_proximity_tip: vm-tablet_proximity_tip:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet_proximity tablet_tip' SUITE_NAMES: 'tablet_proximity tablet_tip'
@ -720,7 +720,7 @@ vm-tablet_proximity_tip-no-libwacom:
vm-tablet_eraser: vm-tablet_eraser:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet_eraser' SUITE_NAMES: 'tablet_eraser'
@ -733,7 +733,7 @@ vm-tablet_eraser-no-libwacom:
vm-gestures: vm-gestures:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'gestures' SUITE_NAMES: 'gestures'
@ -746,7 +746,7 @@ vm-gestures-no-libwacom:
vm-backends: vm-backends:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'path udev' SUITE_NAMES: 'path udev'
@ -759,7 +759,7 @@ vm-backends-no-libwacom:
vm-misc: vm-misc:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'log misc quirks device' SUITE_NAMES: 'log misc quirks device'
@ -772,7 +772,7 @@ vm-misc-no-libwacom:
vm-other devices: vm-other devices:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch' SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
@ -785,7 +785,7 @@ vm-other devices-no-libwacom:
vm-pointer: vm-pointer:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'pointer' SUITE_NAMES: 'pointer'
@ -798,7 +798,7 @@ vm-pointer-no-libwacom:
vm-lua: vm-lua:
extends: extends:
- .fedora:42@test-suite-vm - .fedora:43@test-suite-vm
variables: variables:
SUITE_NAMES: 'lua' SUITE_NAMES: 'lua'
@ -1038,12 +1038,12 @@ vm-valgrind-lua:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .build@template - .build@template
variables: variables:
FDO_DISTRIBUTION_VERSION: '42' FDO_DISTRIBUTION_VERSION: '43'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:42@container-prep" - "fedora:43@container-prep"
default-build-release@fedora:42: default-build-release@fedora:43:
stage: distro stage: distro
extends: extends:
- .fedora-build@template - .fedora-build@template
@ -1051,7 +1051,7 @@ default-build-release@fedora:42:
MESON_ARGS: "-Dbuildtype=release" MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror" CFLAGS: "-Werror"
clang-tidy@fedora:42: clang-tidy@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1066,13 +1066,13 @@ clang-tidy@fedora:42:
# run them on one image, they shouldn't fail on one distro # run them on one image, they shouldn't fail on one distro
# when they succeed on another. # when they succeed on another.
build-no-libwacom@fedora:42: build-no-libwacom@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
build-no-libwacom-nodeps@fedora:42: build-no-libwacom-nodeps@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1080,13 +1080,13 @@ build-no-libwacom-nodeps@fedora:42:
before_script: before_script:
- dnf remove -y libwacom libwacom-devel - dnf remove -y libwacom libwacom-devel
build-no-mtdev@fedora:42: build-no-mtdev@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dmtdev=false" MESON_ARGS: "-Dmtdev=false"
build-no-mtdev-nodeps@fedora:42: build-no-mtdev-nodeps@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1094,13 +1094,13 @@ build-no-mtdev-nodeps@fedora:42:
before_script: before_script:
- dnf remove -y mtdev mtdev-devel - dnf remove -y mtdev mtdev-devel
build-no-lua@fedora:42: build-no-lua@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dlua-plugins=disabled" MESON_ARGS: "-Dlua-plugins=disabled"
build-no-lua-nodeps@fedora:42: build-no-lua-nodeps@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1108,13 +1108,13 @@ build-no-lua-nodeps@fedora:42:
before_script: before_script:
- dnf remove -y lua lua-devel - dnf remove -y lua lua-devel
build-docs@fedora:42: build-docs@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Ddocumentation=true" MESON_ARGS: "-Ddocumentation=true"
build-no-docs-nodeps@fedora:42: build-no-docs-nodeps@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1122,13 +1122,13 @@ build-no-docs-nodeps@fedora:42:
before_script: before_script:
- dnf remove -y doxygen graphviz - dnf remove -y doxygen graphviz
build-no-debuggui@fedora:42: build-no-debuggui@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Ddebug-gui=false" MESON_ARGS: "-Ddebug-gui=false"
build-no-debuggui-nodeps@fedora:42: build-no-debuggui-nodeps@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1136,13 +1136,13 @@ build-no-debuggui-nodeps@fedora:42:
before_script: before_script:
- dnf remove -y gtk3-devel gtk4-devel - dnf remove -y gtk3-devel gtk4-devel
build-no-tests@fedora:42: build-no-tests@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
build-no-tests-nodeps@fedora:42: build-no-tests-nodeps@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1150,7 +1150,7 @@ build-no-tests-nodeps@fedora:42:
before_script: before_script:
- dnf remove -y check-devel - dnf remove -y check-devel
valgrind@fedora:42: valgrind@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -1158,7 +1158,7 @@ valgrind@fedora:42:
# Python checks, only run on Fedora # Python checks, only run on Fedora
usr-bin-env-python@fedora:42: usr-bin-env-python@fedora:43:
extends: extends:
- .fedora-build@template - .fedora-build@template
script: script:
@ -1269,18 +1269,6 @@ coverity:
# # # #
################################################################# #################################################################
fedora:41@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:41@container-prep"
fedora:42@default-build: fedora:42@default-build:
stage: distro stage: distro
extends: extends:
@ -1293,6 +1281,18 @@ fedora:42@default-build:
- "fedora:42@container-prep" - "fedora:42@container-prep"
fedora:43@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '43'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:43@container-prep"
debian:stable@default-build: debian:stable@default-build:
stage: distro stage: distro
extends: extends:
@ -1305,16 +1305,16 @@ debian:stable@default-build:
- "debian:stable@container-prep" - "debian:stable@container-prep"
ubuntu:25.04@default-build: ubuntu:25.10@default-build:
stage: distro stage: distro
extends: extends:
- .build@template - .build@template
- .fdo.distribution-image@ubuntu - .fdo.distribution-image@ubuntu
variables: variables:
FDO_DISTRIBUTION_VERSION: '25.04' FDO_DISTRIBUTION_VERSION: '25.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs: needs:
- "ubuntu:25.04@container-prep" - "ubuntu:25.10@container-prep"
arch:rolling@default-build: arch:rolling@default-build:
@ -1371,10 +1371,10 @@ build rpm:
- .fdo-runner-tags - .fdo-runner-tags
stage: deploy stage: deploy
variables: variables:
FDO_DISTRIBUTION_VERSION: '42' FDO_DISTRIBUTION_VERSION: '43'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:42@container-prep" - "fedora:43@container-prep"
script: script:
- meson "$MESON_BUILDDIR" - meson "$MESON_BUILDDIR"
- VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version) - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version)

View file

@ -3,14 +3,14 @@
# #
# We're happy to rebuild all containers when one changes. # We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2025-08-01.0' .default_tag: &default_tag '2025-11-04.0'
distributions: distributions:
- name: fedora - name: fedora
tag: *default_tag tag: *default_tag
versions: versions:
- '41'
- '42' - '42'
- '43'
use_for_custom_build_tests: true use_for_custom_build_tests: true
use_for_qemu_tests: true use_for_qemu_tests: true
packages: packages:
@ -80,7 +80,7 @@ distributions:
- name: ubuntu - name: ubuntu
tag: *default_tag tag: *default_tag
versions: versions:
- '25.04' - '25.10'
packages: packages:
- git - git
- gcc - gcc