[glib/wip/hadess/add-memory-monitor: 1/3] ci: Add dependencies for newer installed tests
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/hadess/add-memory-monitor: 1/3] ci: Add dependencies for newer installed tests
- Date: Mon, 9 Dec 2019 11:20:28 +0000 (UTC)
commit 87b790c1ce0ccad55e7f84920d0968055b0f3851
Author: Bastien Nocera <hadess hadess net>
Date: Wed Dec 4 14:40:39 2019 +0100
ci: Add dependencies for newer installed tests
.gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d49aff5f7..8798ee7b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,7 +94,13 @@ installed-tests:
extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
stage: build
+ before_script:
+ # FIXME move to docker image
+ - sudo dnf install -y gnome-desktop-testing python3-dbusmock xdg-desktop-portal
script:
+ # FIXME Install xdg-desktop-portal build deps before compiling glib,
+ # so it doesn't overwrite our own glib build
+ - sudo dnf install -y autoconf automake gettext-devel libtool diffutils fontconfig-devel json-glib-devel
geoclue2-devel pipewire-devel fuse-devel make
# dtrace is disabled because it breaks the static-link.py test
- meson ${MESON_COMMON_OPTIONS}
--werror
@@ -106,8 +112,35 @@ installed-tests:
_build
- ninja -C _build
- sudo ninja -C _build install
+ # FIXME install libportal to build new xdg-desktop-portal
+ - git clone https://github.com/flatpak/libportal.git
+ - cd libportal/
+ - meson ${MESON_COMMON_OPTIONS} _build --prefix=/usr --libdir=/usr/lib64
+ - ninja -C _build
+ - sudo ninja -C _build install
+ - cd ..
+ # FIXME Install newer xdg-desktop-portal with
+ # GMemoryMonitor support, see:
+ # https://github.com/flatpak/xdg-desktop-portal/pull/365
+ - git clone --single-branch --branch wip/hadess/memory-monitor
https://github.com/flatpak/xdg-desktop-portal.git
+ - cd xdg-desktop-portal
+ - ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-dependency-tracking && make && sudo make
install
+ # FIXME install newer gobject-introspection
+ # with GMemoryMonitor support, see:
+ # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
+ - sudo dnf install -y meson flex bison python3-devel
+ - git clone --single-branch --branch wip/hadess/add-memory-monitor
https://gitlab.gnome.org/GNOME/gobject-introspection.git
+ - cd gobject-introspection
+ - /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64
+ - ninja -C _build
+ - sudo ninja -C _build install
+ - cd ..
+ # FIXME: Add update until stable https://bodhi.fedoraproject.org/updates/FEDORA-2019-e830287661
+ - sudo dnf upgrade --advisory=FEDORA-2019-e830287661
# FIXME: Add update until stable https://bodhi.fedoraproject.org/updates/FEDORA-2019-161b129d4d
- sudo dnf upgrade -y --enablerepo=updates-testing --advisory=FEDORA-2019-161b129d4d
+ # Work-around https://gitlab.gnome.org/GNOME/gnome-desktop-testing/merge_requests/2
+ - mkdir -p _build/installed-tests-report/logs/
- GLIB_TEST_COMPILATION=1 gnome-desktop-testing-runner
--report-directory=_build/installed-tests-report/failed/
--log-directory=_build/installed-tests-report/logs/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]