diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-09-29 21:03:23 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-09-30 09:47:20 -0400 |
| commit | 8bb28bab74ac9c9e0c5012ad17c520e38ab5bd83 (patch) | |
| tree | f7c0ea7392e2c1be72a8a84ab7fbfb7a087de503 | |
| parent | dad6d58450158a883a89c6442d5bc3b6d6f01ced (diff) | |
| download | pango-8bb28bab74ac9c9e0c5012ad17c520e38ab5bd83.tar.gz | |
ci: Update meson version
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | .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} |