From 4059820391cef577496285abda35d6ce7e2d9667 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 24 Jul 2024 13:51:58 +1000
Subject: [PATCH] CI: bump to Fedora 40

---
 .gitlab-ci.yml        | 44 +++++++++++++++++++++----------------------
 .gitlab-ci/config.yml |  6 +++---
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 215e3a6..5811fa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,8 +48,8 @@ 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-07-24.2'
-  DEBIAN_TAG:  '2024-07-24.2'
+  FEDORA_TAG:  '2024-07-24.3'
+  DEBIAN_TAG:  '2024-07-24.3'
 
   FDO_UPSTREAM_REPO: libinput/libei
 
@@ -166,14 +166,14 @@ python-ruff:
 # Build distribution-specific images used by the jobs in the build stage
 #
 
-fedora:39@container-prep:
+fedora:40@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: 'pip install $FEDORA_PIP_PACKAGES'
@@ -224,12 +224,12 @@ debian:bullseye@container-prep:
     - .build@template
   variables:
     MESON_TEST_ARGS: '--no-suite=python'
-    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
@@ -237,13 +237,13 @@ default-build-release@fedora:39:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror -Wno-error=vla-parameter"  # munit triggers -Wvla-parameter
 
-build-no-libxkcommon-nodeps@fedora:39:
+build-no-libxkcommon-nodeps@fedora:40:
   extends:
     - .fedora-build@template
   before_script:
     - dnf remove -y libxkcommon-devel
 
-build-no-doxygen@fedora:39:
+build-no-doxygen@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -251,7 +251,7 @@ build-no-doxygen@fedora:39:
   before_script:
     - dnf remove -y doxygen
 
-valgrind@fedora:39:
+valgrind@fedora:40:
   extends:
     - .fedora-build@template
   variables:
@@ -259,20 +259,20 @@ valgrind@fedora:39:
   before_script:
     - dnf install -y valgrind
 
-pytest@fedora:39:
+pytest@fedora:40:
   extends:
     - .fedora-build@template
   variables:
     MESON_TEST_ARGS: '--suite=python'
 
-werror@fedora:39:
+werror@fedora:40:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: '-Dwerror=true'
   allow_failure: true
 
-abicheck@fedora:39:
+abicheck@fedora:40:
   extends:
     - .fedora-build@template
   before_script:
@@ -290,7 +290,7 @@ abicheck@fedora:39:
   only:
     - merge_requests
 
-event-type-check@fedora:39:
+event-type-check@fedora:40:
   extends:
     - .fedora-build@template
   script:
@@ -328,24 +328,24 @@ minimum-meson@debian:bullseye:
 #                                                               #
 #################################################################
 
-fedora:39@default-build:
+fedora:40@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:39@container-prep"
+    - "fedora:40@container-prep"
 
-fedora:39@doc-build:
+fedora:40@doc-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     MESON_ARGS: "-Ddocumentation=protocol,api"
   script:
@@ -380,15 +380,15 @@ pages:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     MESON_ARGS: "-Ddocumentation=protocol,api"
   script:
     - echo "Nothing to do"
   dependencies:
-    - "fedora:39@doc-build"
+    - "fedora:40@doc-build"
   needs:
-    - "fedora:39@doc-build"
+    - "fedora:40@doc-build"
   only:
     refs:
       - main
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 42ac8dc..d89d0fd 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,7 +3,7 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2024-07-24.2'
+.default_tag: &default_tag '2024-07-24.3'
 
 last_abi_break: abe85e051e7029bfd2e7913ab980a9e0042b6d0d
 minimum_meson_version: 0.57.0
@@ -12,7 +12,7 @@ distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '39' # update the pages job when bumping the version
+      - '40' # update the pages job when bumping the version
     use_for_custom_build_tests: true
     packages:
       - git
@@ -65,4 +65,4 @@ distributions:
 
 pages:
   distro: fedora
-  version: 39
+  version: 40