[gtk/matthiasc/for-master: 4/7] ci: Use a newer meson in images
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master: 4/7] ci: Use a newer meson in images
- Date: Wed, 30 Sep 2020 19:26:31 +0000 (UTC)
commit dfd16e398269da79b904afbb50f5f4cb630bba4c
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 30 15:12:32 2020 -0400
ci: Use a newer meson in images
We need meson 0.54.
.gitlab-ci/fedora-base.Dockerfile | 2 +-
.gitlab-ci/fedora-docs.Dockerfile | 2 +-
.gitlab-ci/fedora.Dockerfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile
index 2dec8c1a9c..70feffded2 100644
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -87,5 +87,5 @@ RUN dnf -y install \
xorg-x11-server-Xvfb \
&& dnf clean all
-RUN pip3 install meson==0.53.1
+RUN pip3 install meson==0.54.3
diff --git a/.gitlab-ci/fedora-docs.Dockerfile b/.gitlab-ci/fedora-docs.Dockerfile
index a99a15e6c2..6233d38708 100644
--- a/.gitlab-ci/fedora-docs.Dockerfile
+++ b/.gitlab-ci/fedora-docs.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v24
RUN dnf -y install pandoc
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 0b86a6dbd5..0abba4bad5 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v23
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v24
# Enable sudo for wheel users
RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]