[pango: 2/3] ci: Update meson version




commit 8bb28bab74ac9c9e0c5012ad17c520e38ab5bd83
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Tue Sep 29 21:03:23 2020 -0400

    ci: Update meson version

 .gitlab-ci.yml               | 7 ++++---
 .gitlab-ci/fedora.Dockerfile | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dffa8056..921f6ab2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,10 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v3
 
 linux-fedora:
-  image: registry.gitlab.gnome.org/gnome/pango/fedora:v2
+  image: $FEDORA_IMAGE
   stage: build
   needs: []
   variables:
@@ -34,7 +35,7 @@ linux-fedora:
       - "${CI_PROJECT_DIR}/_build/fontlist.txt"
 
 asan-build:
-  image: registry.gitlab.gnome.org/gnome/pango/fedora:v2
+  image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
   needs: []
@@ -78,7 +79,7 @@ msys2-mingw64:
       - _build/fontlist.txt
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/pango/fedora:v1
+  image: $FEDORA_IMAGE
   stage: docs
   needs: []
   variables:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index f2240cac..9447bdb1 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.53.1
+RUN pip3 install meson==0.54.3
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]