From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 4 May 2023 00:18:24 +0000 (-0400)
Subject: ci: Add meson back to the fedora image
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~313^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bfea39ab2f1e9c1924828e95f464aa8252e2b123;p=gtk4.git

ci: Add meson back to the fedora image
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f99dd5ccae..65686b7d64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v45"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46"
 
 workflow:
   rules:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 423a076854..39c606e856 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -72,6 +72,7 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
+    meson \
     mutter \
     ninja-build \
     pango-devel \