[gtk] ci: Update Docker image to Fedora 29 and meson to 0.49.0
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] ci: Update Docker image to Fedora 29 and meson to 0.49.0
- Date: Sun, 16 Dec 2018 21:00:22 +0000 (UTC)
commit a99bd2a422f7c7a04c6dc43bd4d1e814cd187718
Author: Christoph Reiter <creiter src gnome org>
Date: Sun Dec 16 21:32:25 2018 +0100
ci: Update Docker image to Fedora 29 and meson to 0.49.0
.gitlab-ci.yml | 4 ++--
.gitlab-ci/Dockerfile | 4 ++--
.gitlab-ci/run-docker.sh | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a67069ebee..b60004ae1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
- subprojects/pango/
fedora-x86_64:
- image: registry.gitlab.gnome.org/gnome/gtk/master:v1
+ image: registry.gitlab.gnome.org/gnome/gtk/master:v2
stage: build
script:
- bash -x ./.gitlab-ci/test-docker.sh
@@ -64,7 +64,7 @@ flatpak:widget-factory:
<<: *flatpak-defaults
pages:
- image: registry.gitlab.gnome.org/gnome/gtk/master:v1
+ image: registry.gitlab.gnome.org/gnome/gtk/master:v2
stage: deploy
script:
- meson -Ddocumentation=true _build .
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 52dcaa1985..051bd9da4c 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:29
RUN dnf -y install \
hicolor-icon-theme \
@@ -70,7 +70,7 @@ RUN dnf -y install \
xorg-x11-server-Xvfb \
&& dnf clean all
-RUN pip3 install meson
+RUN pip3 install meson==0.49.0
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index c7298bae30..1fba076bd9 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v1"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]