From a240e181c0680c22d5e20576eecf528c77e3346d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 16 Aug 2021 15:00:46 +1000
Subject: [PATCH] gitlab CI: bump the Fedora version to 34

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml         | 34 +++++++++++++++++-----------------
 .gitlab-ci/ci.template |  2 +-
 .gitlab-ci/config.yml  |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef694a3..f0cb08d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ 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:  '2020-09-25.0'
+  FEDORA_TAG:  '2021-08-16.0'
 
   FDO_UPSTREAM_REPO: libinput/libei
 
@@ -132,14 +132,14 @@ check-merge-request:
 # Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
 #
 #
-fedora:32@container-prep:
+fedora:34@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '32'
+    FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
@@ -178,14 +178,14 @@ fedora:32@container-prep:
   only:
     - schedules
 
-fedora:32@container-clean:
+fedora:34@container-clean:
   extends:
     - .container-clean
   variables:
     GIT_STRATEGY: none
-    FEDORA_VERSION: '32'
+    FEDORA_VERSION: '34'
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '32'
+    FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 
@@ -213,26 +213,26 @@ fedora:32@container-clean:
     - .fdo.distribution-image@fedora
     - .build@template
   variables:
-    FDO_DISTRIBUTION_VERSION: '32'
+    FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:32@container-prep"
+    - "fedora:34@container-prep"
 
-default-build-release@fedora:32:
+default-build-release@fedora:34:
   stage: distro
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dbuildtype=release"
-    CFLAGS: "-Werror"
+    CFLAGS: "-Werror -Wno-error=vla-parameter"  # munit triggers -Wvla-parameter
 
-build-no-libxkcommon-nodeps@fedora:32:
+build-no-libxkcommon-nodeps@fedora:34:
   extends:
     - .fedora-build@template
   before_script:
     - dnf remove -y libxkcommon-devel
 
-build-no-doxygen@fedora:32:
+build-no-doxygen@fedora:34:
   extends:
     - .fedora-build@template
   variables:
@@ -240,7 +240,7 @@ build-no-doxygen@fedora:32:
   before_script:
     - dnf remove -y doxygen
 
-build-no-portal@fedora:32:
+build-no-portal@fedora:34:
   extends:
     - .fedora-build@template
   before_script:
@@ -248,7 +248,7 @@ build-no-portal@fedora:32:
   variables:
     MESON_ARGS: "-Dportal=false"
 
-valgrind@fedora:32:
+valgrind@fedora:34:
   extends:
     - .fedora-build@template
   variables:
@@ -263,16 +263,16 @@ valgrind@fedora:32:
 #                                                               #
 #################################################################
 
-fedora:32@default-build:
+fedora:34@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '32'
+    FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:32@container-prep"
+    - "fedora:34@container-prep"
 
 
 pages:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index c08397a..cc5277d 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -245,7 +245,7 @@ default-build-release@{{distro.name}}:{{version}}:
     - .{{distro.name}}-build@template
   variables:
     MESON_ARGS: "-Dbuildtype=release"
-    CFLAGS: "-Werror"
+    CFLAGS: "-Werror -Wno-error=vla-parameter"  # munit triggers -Wvla-parameter
 
 build-no-libxkcommon-nodeps@{{distro.name}}:{{version}}:
   extends:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index b7d9693..c1b1b0a 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,11 +3,11 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2020-09-25.0'
+.default_tag: &default_tag '2021-08-16.0'
 
 distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '32'
+      - '34'
     use_for_custom_build_tests: true