diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2019-10-28 20:39:22 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2019-10-28 20:39:22 +0000 |
| commit | 0655eac0ee05348700ff426db2b35befd0c88d1a (patch) | |
| tree | 32021195523b51579627c34f86afc425cf4d6c3e | |
| parent | 9a43def9efad9f62d69d8971cd032ae7fc61976a (diff) | |
| parent | 3e517c0ab2f00c3c0bb526792a8df449cd622ae9 (diff) | |
| download | glib-0655eac0ee05348700ff426db2b35befd0c88d1a.tar.gz | |
Merge branch 'ci-libdbus' into 'master'
ci: Add libdbus development files to CI Docker images
See merge request GNOME/glib!1177
| -rw-r--r-- | .gitlab-ci/debian-stable.Dockerfile | 1 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile index faaaae039..7841bedd0 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ itstool \ lcov \ libattr1-dev \ + libdbus-1-dev \ libelf-dev \ libffi-dev \ libgamin-dev \ diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 9b01ccf00..51ec8dc0d 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -5,6 +5,7 @@ RUN dnf -y install \ clang \ clang-analyzer \ dbus-daemon \ + dbus-devel \ desktop-file-utils \ elfutils-libelf-devel \ findutils \ |