From 642b40e1e4ec0e7be36d905e2122dd891dd8a0de Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 10 Dec 2021 11:57:39 -0500
Subject: ci: Rebase the image to Fedora 34

This gives us a newer meson, among other things.
---
 .gitlab-ci.yml               | 2 +-
 .gitlab-ci/fedora.Dockerfile | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b9f5200..e93f7dea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
-  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v6
+  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v8
 
 .only-default:
   only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index ebb1e6b5..8db2643b 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:34
 
 RUN dnf -y install \
     abattis-cantarell-fonts \
@@ -32,6 +32,7 @@ RUN dnf -y install \
     libubsan \
     libXft-devel \
     llvm \
+    meson \
     ninja-build \
     python3 \
     python3-jinja2 \
@@ -45,8 +46,6 @@ RUN dnf -y install \
     thai-scalable-waree-fonts \
  && dnf clean all
 
-RUN pip3 install meson==0.56
-
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-- 
cgit v1.2.1