[clutter/build-fix: 5/5] ci: Update the Docker image
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/build-fix: 5/5] ci: Update the Docker image
- Date: Sun, 15 Mar 2020 15:07:02 +0000 (UTC)
commit 14df2c77c0cf1e388710739ef76cc668cdd6e629
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sun Mar 15 15:05:41 2020 +0000
ci: Update the Docker image
Don't use something from ancient times, even if we haven't touched
Clutter in a long while.
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34a7031d0..c509ac849 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/clutter/master:v1
+ image: registry.gitlab.gnome.org/gnome/clutter/master:v2
stage: build
script:
- bash -x ./.gitlab-ci/test-docker.sh
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 091710d30..231d4dedb 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:31
RUN dnf -y install \
adwaita-icon-theme \
@@ -57,7 +57,7 @@ RUN dnf -y install \
xorg-x11-server-Xvfb \
&& dnf clean all
-RUN pip3 install meson
+RUN pip3 install meson==0.49.2
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]