From ab892acf11de79245783750785a165945d300b44 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Mon, 12 Nov 2018 12:44:19 +0000 Subject: [PATCH] ci: add bindfs and fuse to Fedora CI image Without `bindfs` and `fusermount`, all tests in g-file-info-filesystem-readonly.c are skipped. --- .gitlab-ci.yml | 2 +- .gitlab-ci/Dockerfile | 2 ++ .gitlab-ci/run-docker.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7923fb506..6dee29ea4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/glib/master:v9 +image: registry.gitlab.gnome.org/gnome/glib/master:v10 stages: - build diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 1a0dd11aa..aa37c7c66 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -3,9 +3,11 @@ FROM fedora:27 RUN dnf -y install \ autoconf \ automake \ + bindfs \ desktop-file-utils \ elfutils-libelf-devel \ findutils \ + fuse \ gamin-devel \ gcc \ gcc-c++ \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 42d953857..f9a8c7513 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/glib/master:v9" +TAG="registry.gitlab.gnome.org/gnome/glib/master:v10" docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" .