From caa93d9803151644a2aab1bde46c4582fbf2a7c7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 7 Apr 2021 18:07:03 +0100 Subject: ci: Update the version of Meson We require 0.56.0. --- .gitlab-ci.yml | 2 +- .gitlab/ci/fedora.Dockerfile | 2 +- 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} -- cgit v1.2.1