From bf6087f2da41fc04ae6589495a7808b5602caeb6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 20 Mar 2020 15:36:39 +0000 Subject: [PATCH] ci: Add dbus-launch to the Docker build --- .gitlab-ci.yml | 10 +++++----- .gitlab-ci/fedora.Dockerfile | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c497040add..857586f6fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,14 +27,14 @@ variables: style-check-diff: extends: .only-default - image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14 + image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15 stage: .pre allow_failure: true script: - .gitlab-ci/run-style-check-diff.sh fedora-x86_64: - image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14 + image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15 stage: build variables: EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" @@ -66,7 +66,7 @@ fedora-x86_64: <<: *cache-paths release-build: - image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14 + image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15 stage: build variables: EXTRA_MESON_FLAGS: "--buildtype=release" @@ -168,7 +168,7 @@ flatpak-master:icon-browser: <<: *flatpak-master static-scan: - image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14 + image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15 stage: analysis variables: EXTRA_MESON_FLAGS: "--buildtype=debug" @@ -181,7 +181,7 @@ static-scan: allow_failure: true reference: - image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14 + image: registry.gitlab.gnome.org/gnome/gtk/fedora:v15 stage: docs variables: EXTRA_MESON_FLAGS: "--buildtype=release" diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 10cb2f7f6a..a21549473b 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -13,6 +13,7 @@ RUN dnf -y install \ colord-devel \ cups-devel \ dbus-daemon \ + dbus-x11 \ dejavu-sans-mono-fonts \ desktop-file-utils \ diffutils \