[gdk-pixbuf/ci-updates] ci: Update the Docker image
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf/ci-updates] ci: Update the Docker image
- Date: Tue, 26 Nov 2019 10:25:02 +0000 (UTC)
commit cb15006b18c7d382fcb8a7b1bcc886bb78b09525
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Nov 26 10:24:05 2019 +0000
ci: Update the Docker image
Install Meson 0.48.1, in preparation for merging !51.
.gitlab-ci.yml | 2 +-
.gitlab/ci/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 783793f67..b3957070f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
- _ccache/
meson-fedora-x86_64:
- image: registry.gitlab.gnome.org/gnome/gdk-pixbuf/master:v1
+ image: registry.gitlab.gnome.org/gnome/gdk-pixbuf/master:v2
stage: build
variables:
BUILD_OPTS: "-Dpng=true -Djpeg=true -Dtiff=true -Djasper=true"
diff --git a/.gitlab/ci/Dockerfile b/.gitlab/ci/Dockerfile
index 82d583f16..5996b9fb0 100644
--- a/.gitlab/ci/Dockerfile
+++ b/.gitlab/ci/Dockerfile
@@ -22,7 +22,7 @@ RUN dnf -y install \
shared-mime-info \
&& dnf clean all
-RUN pip3 install meson
+RUN pip3 install meson==0.48.1
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]