CI: bump to Fedora 40

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1000>

.gitlab-ci.yml

@@ -95,12 +95,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:  '2024-03-18.0'
-  DEBIAN_TAG:  '2024-03-18.0'
-  UBUNTU_TAG:  '2024-03-18.0'
-  ARCH_TAG:    '2024-03-18.0'
-  ALPINE_TAG:  '2024-03-18.0'
-  FREEBSD_TAG: '2024-03-18.0'
+  FEDORA_TAG:  '2024-05-13.0'
+  DEBIAN_TAG:  '2024-05-13.0'
+  UBUNTU_TAG:  '2024-05-13.0'
+  ARCH_TAG:    '2024-05-13.0'
+  ALPINE_TAG:  '2024-05-13.0'
+  FREEBSD_TAG: '2024-05-13.0'
 
   FDO_UPSTREAM_REPO: libinput/libinput
 
@@ -222,17 +222,6 @@ check-whitespace:
 #                                                               #
 #################################################################
 
-fedora:38@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-    - .policy
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '38'
-    FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:39@container-prep:
   extends:
     - .fdo.container-build@fedora
@@ -244,6 +233,17 @@ fedora:39@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
+fedora:40@container-prep:
+  extends:
+    - .fdo.container-build@fedora
+    - .policy
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+
 debian:stable@container-prep:
   extends:
     - .fdo.container-build@debian
@@ -333,16 +333,6 @@ freebsd:13.2@container-prep:
   only:
     - schedules
 
-fedora:38@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: '38'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:39@container-clean:
   extends:
     - .policy
@@ -353,6 +343,16 @@ fedora:39@container-clean:
     FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
+fedora:40@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: '40'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+
 debian:stable@container-clean:
   extends:
     - .policy
@@ -517,20 +517,20 @@ freebsd:13.2@container-clean:
     - export LITEST_JOBS="2"
 
 
-.fedora:39@test-suite-vm:
+.fedora:40@test-suite-vm:
   extends:
     - .fdo.distribution-image@fedora
     - .test-suite-vm
   variables:
-    FDO_DISTRIBUTION_VERSION: 39
+    FDO_DISTRIBUTION_VERSION: 40
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:39@container-prep"
+    - "fedora:40@container-prep"
 
 
 vm-touchpad:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad'
 
@@ -543,7 +543,7 @@ vm-touchpad-no-libwacom:
 
 vm-tap:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad-tap'
 
@@ -556,7 +556,7 @@ vm-tap-no-libwacom:
 
 vm-touchpad-buttons:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad-buttons'
 
@@ -569,7 +569,7 @@ vm-touchpad-buttons-no-libwacom:
 
 vm-tablet:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'tablet'
 
@@ -582,7 +582,7 @@ vm-tablet-no-libwacom:
 
 vm-gestures-device:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'gestures device'
 
@@ -595,7 +595,7 @@ vm-gestures-device-no-libwacom:
 
 vm-backends:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'path udev'
 
@@ -608,7 +608,7 @@ vm-backends-no-libwacom:
 
 vm-misc:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'log misc quirks'
 
@@ -621,7 +621,7 @@ vm-misc-no-libwacom:
 
 vm-other devices:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
 
@@ -634,7 +634,7 @@ vm-other devices-no-libwacom:
 
 vm-pointer:
   extends:
-    - .fedora:39@test-suite-vm
+    - .fedora:40@test-suite-vm
   variables:
     SUITE_NAMES: 'pointer'
 
@@ -724,12 +724,12 @@ vm-valgrind-pointer:
     - .fdo.distribution-image@fedora
     - .build@template
   variables:
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:39@container-prep"
+    - "fedora:40@container-prep"
 
-default-build-release@fedora:39:
+default-build-release@fedora:40:
   stage: distro
   extends:
     - .fedora-build@template
@@ -737,7 +737,7 @@ default-build-release@fedora:39:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror"
 
-scan-build@fedora:39:
+scan-build@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -754,13 +754,13 @@ scan-build@fedora:39:
 # run them on one image, they shouldn't fail on one distro
 # when they succeed on another.
 
-build-no-libwacom@fedora:39:
+build-no-libwacom@fedora:40:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dlibwacom=false"
 
-build-no-libwacom-nodeps@fedora:39:
+build-no-libwacom-nodeps@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -768,13 +768,13 @@ build-no-libwacom-nodeps@fedora:39:
   before_script:
     - dnf remove -y libwacom libwacom-devel
 
-build-docs@fedora:39:
+build-docs@fedora:40:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddocumentation=true"
 
-build-no-docs-nodeps@fedora:39:
+build-no-docs-nodeps@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -782,13 +782,13 @@ build-no-docs-nodeps@fedora:39:
   before_script:
     - dnf remove -y doxygen graphviz
 
-build-no-debuggui@fedora:39:
+build-no-debuggui@fedora:40:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddebug-gui=false"
 
-build-no-debuggui-nodeps@fedora:39:
+build-no-debuggui-nodeps@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -796,13 +796,13 @@ build-no-debuggui-nodeps@fedora:39:
   before_script:
     - dnf remove -y gtk3-devel gtk4-devel
 
-build-no-tests@fedora:39:
+build-no-tests@fedora:40:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dtests=false"
 
-build-no-tests-nodeps@fedora:39:
+build-no-tests-nodeps@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -810,7 +810,7 @@ build-no-tests-nodeps@fedora:39:
   before_script:
     - dnf remove -y check-devel
 
-valgrind@fedora:39:
+valgrind@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -818,7 +818,7 @@ valgrind@fedora:39:
 
 # Python checks, only run on Fedora
 
-usr-bin-env-python@fedora:39:
+usr-bin-env-python@fedora:40:
   extends:
     - .fedora-build@template
   script:
@@ -828,7 +828,7 @@ usr-bin-env-python@fedora:39:
         /bin/false
       fi
 
-python-format@fedora:39:
+python-format@fedora:40:
   extends:
     - .fedora-build@template
   script:
@@ -926,18 +926,6 @@ coverity:
 #                                                               #
 #################################################################
 
-fedora:38@default-build:
-  stage: distro
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '38'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:38@container-prep"
-
-
 fedora:39@default-build:
   stage: distro
   extends:
@@ -950,6 +938,18 @@ fedora:39@default-build:
     - "fedora:39@container-prep"
 
 
+fedora:40@default-build:
+  stage: distro
+  extends:
+    - .build@template
+    - .fdo.distribution-image@fedora
+  variables:
+    FDO_DISTRIBUTION_VERSION: '40'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+  needs:
+    - "fedora:40@container-prep"
+
+
 debian:stable@default-build:
   stage: distro
   extends:
@@ -1046,10 +1046,10 @@ build rpm:
     - .policy
   stage: deploy
   variables:
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:39@container-prep"
+    - "fedora:40@container-prep"
   script:
     - meson "$MESON_BUILDDIR"
     - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version)

.gitlab-ci/config.yml

@@ -3,14 +3,14 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2024-03-18.0'
+.default_tag: &default_tag '2024-05-13.0'
 
 distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '38'
       - '39'
+      - '40'
     use_for_custom_build_tests: true
     use_for_qemu_tests: true
     packages: