ci: bump to Fedora 39 and FreeBSD to 13.2

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

2 files changed, 59 insertions, 59 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d3b7b87..11e3b2a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,12 +93,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:  '2023-02-13.0'
-  DEBIAN_TAG:  '2023-02-13.0'
-  UBUNTU_TAG:  '2023-02-13.0'
-  ARCH_TAG:    '2023-02-13.0'
-  ALPINE_TAG:  '2023-02-13.0'
-  FREEBSD_TAG: '2023-02-13.0'
+  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'
 
   FDO_UPSTREAM_REPO: libinput/libinput
 
@@ -220,25 +220,25 @@ check-whitespace:
 #                                                               #
 #################################################################
 
-fedora:37@container-prep:
+fedora:38@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '37'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:38@container-prep:
+fedora:39@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
@@ -286,7 +286,7 @@ alpine:latest@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES
     FDO_DISTRIBUTION_TAG: $ALPINE_TAG
 
-freebsd:13.1@container-prep:
+freebsd:13.2@container-prep:
   extends:
     - .fdo.qemu-build@freebsd
     - .policy
@@ -295,7 +295,7 @@ freebsd:13.1@container-prep:
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '13.1'
+    FDO_DISTRIBUTION_VERSION: '13.2'
     FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES
     FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
 
@@ -331,24 +331,24 @@ freebsd:13.1@container-prep:
   only:
     - schedules
 
-fedora:37@container-clean:
+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: '37'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:38@container-clean:
+fedora:39@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_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 debian:stable@container-clean:
@@ -391,14 +391,14 @@ alpine:latest@container-clean:
     FDO_DISTRIBUTION_VERSION: 'latest'
     FDO_DISTRIBUTION_TAG: $ALPINE_TAG
 
-freebsd:13.1@container-clean:
+freebsd:13.2@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '13.1'
+    FDO_DISTRIBUTION_VERSION: '13.2'
     FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
 
 
@@ -515,20 +515,20 @@ freebsd:13.1@container-clean:
     - export LITEST_JOBS="2"
 
 
-.fedora:38@test-suite-vm:
+.fedora:39@test-suite-vm:
   extends:
     - .fdo.distribution-image@fedora
     - .test-suite-vm
   variables:
-    FDO_DISTRIBUTION_VERSION: 38
+    FDO_DISTRIBUTION_VERSION: 39
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:38@container-prep"
+    - "fedora:39@container-prep"
 
 
 vm-touchpad:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad'
 
@@ -541,7 +541,7 @@ vm-touchpad-no-libwacom:
 
 vm-tap:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad-tap'
 
@@ -554,7 +554,7 @@ vm-tap-no-libwacom:
 
 vm-touchpad-buttons:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad-buttons'
 
@@ -567,7 +567,7 @@ vm-touchpad-buttons-no-libwacom:
 
 vm-tablet:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'tablet'
 
@@ -580,7 +580,7 @@ vm-tablet-no-libwacom:
 
 vm-gestures-device:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'gestures device'
 
@@ -593,7 +593,7 @@ vm-gestures-device-no-libwacom:
 
 vm-backends:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'path udev'
 
@@ -606,7 +606,7 @@ vm-backends-no-libwacom:
 
 vm-misc:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'log misc quirks'
 
@@ -619,7 +619,7 @@ vm-misc-no-libwacom:
 
 vm-other devices:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
 
@@ -632,7 +632,7 @@ vm-other devices-no-libwacom:
 
 vm-pointer:
   extends:
-    - .fedora:38@test-suite-vm
+    - .fedora:39@test-suite-vm
   variables:
     SUITE_NAMES: 'pointer'
 
@@ -722,12 +722,12 @@ vm-valgrind-pointer:
     - .fdo.distribution-image@fedora
     - .build@template
   variables:
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:38@container-prep"
+    - "fedora:39@container-prep"
 
-default-build-release@fedora:38:
+default-build-release@fedora:39:
   stage: distro
   extends:
     - .fedora-build@template
@@ -735,7 +735,7 @@ default-build-release@fedora:38:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror"
 
-scan-build@fedora:38:
+scan-build@fedora:39:
   extends:
     - .fedora-build@template
   variables:
@@ -752,13 +752,13 @@ scan-build@fedora:38:
 # run them on one image, they shouldn't fail on one distro
 # when they succeed on another.
 
-build-no-libwacom@fedora:38:
+build-no-libwacom@fedora:39:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dlibwacom=false"
 
-build-no-libwacom-nodeps@fedora:38:
+build-no-libwacom-nodeps@fedora:39:
   extends:
     - .fedora-build@template
   variables:
@@ -766,13 +766,13 @@ build-no-libwacom-nodeps@fedora:38:
   before_script:
     - dnf remove -y libwacom libwacom-devel
 
-build-docs@fedora:38:
+build-docs@fedora:39:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddocumentation=true"
 
-build-no-docs-nodeps@fedora:38:
+build-no-docs-nodeps@fedora:39:
   extends:
     - .fedora-build@template
   variables:
@@ -780,13 +780,13 @@ build-no-docs-nodeps@fedora:38:
   before_script:
     - dnf remove -y doxygen graphviz
 
-build-no-debuggui@fedora:38:
+build-no-debuggui@fedora:39:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddebug-gui=false"
 
-build-no-debuggui-nodeps@fedora:38:
+build-no-debuggui-nodeps@fedora:39:
   extends:
     - .fedora-build@template
   variables:
@@ -794,13 +794,13 @@ build-no-debuggui-nodeps@fedora:38:
   before_script:
     - dnf remove -y gtk3-devel gtk4-devel
 
-build-no-tests@fedora:38:
+build-no-tests@fedora:39:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dtests=false"
 
-build-no-tests-nodeps@fedora:38:
+build-no-tests-nodeps@fedora:39:
   extends:
     - .fedora-build@template
   variables:
@@ -808,7 +808,7 @@ build-no-tests-nodeps@fedora:38:
   before_script:
     - dnf remove -y check-devel
 
-valgrind@fedora:38:
+valgrind@fedora:39:
   extends:
     - .fedora-build@template
   variables:
@@ -816,7 +816,7 @@ valgrind@fedora:38:
 
 # Python checks, only run on Fedora
 
-usr-bin-env-python@fedora:38:
+usr-bin-env-python@fedora:39:
   extends:
     - .fedora-build@template
   script:
@@ -826,7 +826,7 @@ usr-bin-env-python@fedora:38:
         /bin/false
       fi
 
-python-format@fedora:38:
+python-format@fedora:39:
   extends:
     - .fedora-build@template
   script:
@@ -924,28 +924,28 @@ coverity:
 #                                                               #
 #################################################################
 
-fedora:37@default-build:
+fedora:38@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '37'
+    FDO_DISTRIBUTION_VERSION: '38'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:37@container-prep"
+    - "fedora:38@container-prep"
 
 
-fedora:38@default-build:
+fedora:39@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:38@container-prep"
+    - "fedora:39@container-prep"
 
 
 debian:stable@default-build:
@@ -998,18 +998,18 @@ alpine:latest@default-build:
     - "alpine:latest@container-prep"
 
 
-freebsd:13.1@default-build:
+freebsd:13.2@default-build:
   stage: distro
   extends:
     - .build-in-qemu@template
     - .fdo.distribution-image@freebsd
   variables:
-    FDO_DISTRIBUTION_VERSION: '13.1'
+    FDO_DISTRIBUTION_VERSION: '13.2'
     FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
     MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps
     MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet
   needs:
-    - "freebsd:13.1@container-prep"
+    - "freebsd:13.2@container-prep"
 
 
 #################################################################
@@ -1044,10 +1044,10 @@ build rpm:
     - .policy
   stage: deploy
   variables:
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:38@container-prep"
+    - "fedora:39@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 6f7bd3f7..454039c8 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 '2023-02-13.0'
+.default_tag: &default_tag '2024-03-18.0'
 
 distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '37'
       - '38'
+      - '39'
     use_for_custom_build_tests: true
     use_for_qemu_tests: true
     packages:
@@ -148,7 +148,7 @@ distributions:
     tag: *default_tag
     qemu_based: true
     versions:
-      - '13.1'
+      - '13.2'
     packages:
       - git
       - pkgconf