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