[gnome-software] ci: Use malcontent subproject in the CI
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] ci: Use malcontent subproject in the CI
- Date: Wed, 8 Jul 2020 17:09:38 +0000 (UTC)
commit ded1c77c79ac4905b2b21050fff4a2afa95a9220
Author: Philip Withnall <withnall endlessm com>
Date: Tue Jul 7 11:57:24 2020 +0100
ci: Use malcontent subproject in the CI
Rather than downloading and building it separately. This makes no
functional difference to the CI, but simplifies the YML a little.
This requires adding the malcontent 0.8.0 dependencies to the Docker
images. The CI previously used malcontent 0.4.0, which is what
gnome-software depends on, but building it as a subproject requires some
fixes which are only available in 0.8.0.
Signed-off-by: Philip Withnall <withnall endlessm com>
.gitlab-ci.yml | 7 -------
.gitlab-ci/debian-stable.Dockerfile | 3 +++
.gitlab-ci/fedora.Dockerfile | 2 ++
3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdf32536..95700ea3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,13 +16,6 @@ fedora-x86_64:
except:
- tags
script:
- - git clone https://gitlab.freedesktop.org/pwithnall/malcontent.git ./malcontent
- - pushd ./malcontent
- - git checkout tags/0.4.0
- - meson setup ${MESON_COMMON_OPTIONS} _build
- - ninja -C _build
- - sudo ninja -C _build install
- - popd
- meson ${MESON_COMMON_OPTIONS}
-Drpm_ostree=true
-Dmalcontent=true
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index 7ea1fd93..1e512eac 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 \
gtk-doc-tools \
itstool \
lcov \
+ libaccountsservice-dev \
libappstream-glib-dev \
libflatpak-dev \
libfwupd-dev \
@@ -30,6 +31,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
libgudev-1.0-dev \
libjson-glib-dev \
libpackagekit-glib2-dev \
+ libpam0g-dev \
libpolkit-gobject-1-dev \
libsoup2.4-dev \
libxmlb-dev \
@@ -37,6 +39,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
ninja-build \
packagekit \
pkg-config \
+ policykit-1 \
python3 \
python3-pip \
python3-setuptools \
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 231604ab..0044a823 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,6 +1,7 @@
FROM fedora:31
RUN dnf -y install \
+ accountsservice-devel \
clang \
clang-analyzer \
dbus-daemon \
@@ -37,6 +38,7 @@ RUN dnf -y install \
ostree-devel \
PackageKit \
PackageKit-glib-devel \
+ pam-devel \
pcre-devel \
polkit-devel \
python3 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]