summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-01-03 20:16:38 -0500
committerMatthias Clasen <mclasen@redhat.com>2021-01-03 20:16:38 -0500
commit124cab53b3ea4f1ad555131ad9708869e13ffd1b (patch)
treeb57e53023d46100e2929456f5b8ea6b86c30f452
parentda05ac0bd0a4eaac1bed07838fe79f5c04cef689 (diff)
downloadpango-124cab53b3ea4f1ad555131ad9708869e13ffd1b.tar.gz
ci: Update meson in the Fedora image
Bump meson to 0.56.0. The new image is fedora:v4.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/fedora.Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a519504a..428b3ff6 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:v3
+ FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v4
linux-fedora:
image: $FEDORA_IMAGE
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 9447bdb1..c1d0e5c4 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -41,7 +41,7 @@ RUN dnf -y install \
thai-scalable-waree-fonts \
&& dnf clean all
-RUN pip3 install meson==0.54.3
+RUN pip3 install meson==0.56
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}