summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2021-04-07 18:07:03 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2021-04-07 18:08:15 +0100
commitcaa93d9803151644a2aab1bde46c4582fbf2a7c7 (patch)
tree6d5b19ae569702ff8a4ae64ddd12d8ad31a52dcf
parentf265a94336c17716b2dcb33198ec34ebf926f98e (diff)
downloadgdk-pixbuf-caa93d9803151644a2aab1bde46c4582fbf2a7c7.tar.gz
ci: Update the version of Meson
We require 0.56.0.
-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 2379cc9a9..19f7516d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ variables:
COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false"
LOADERS_FLAGS: "-Dpng=true -Djpeg=true -Dtiff=true"
MESON_TEST_TIMEOUT_MULTIPLIER: 3
- FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gdk-pixbuf/fedora:v2"
+ FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gdk-pixbuf/fedora:v3"
.only-default:
only:
diff --git a/.gitlab/ci/fedora.Dockerfile b/.gitlab/ci/fedora.Dockerfile
index 804024823..6ae97559c 100644
--- a/.gitlab/ci/fedora.Dockerfile
+++ b/.gitlab/ci/fedora.Dockerfile
@@ -34,7 +34,7 @@ RUN dnf -y install \
which \
&& dnf clean all
-RUN pip3 install meson==0.55.3
+RUN pip3 install meson==0.56.0
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}