[glib/wip/hadess/update-installed-tests-ci] ci: Disable xdg-desktop-portal tests
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/hadess/update-installed-tests-ci] ci: Disable xdg-desktop-portal tests
- Date: Wed, 11 Dec 2019 14:23:52 +0000 (UTC)
commit c782042087578a3fd2a93e31ac5207acc402924b
Author: Bastien Nocera <hadess hadess net>
Date: Wed Dec 11 15:18:53 2019 +0100
ci: Disable xdg-desktop-portal tests
They're not needed to actually run xdg-desktop-portal itself, and
we won't need libportal then.
.gitlab-ci.yml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93bd1a5cb..6afbbe0ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,13 +112,6 @@ 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
@@ -126,7 +119,7 @@ installed-tests:
- cd xdg-desktop-portal
# FIXME Force-enable portal memory monitor until 2.63.3 is released
- sed -i 's/2, 63, 3/2, 63, 2/' src/memory-monitor.c
- - ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-dependency-tracking && make && sudo make
install
+ - ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-libportal --disable-dependency-tracking &&
make && sudo make install
- cd ..
# FIXME install newer gobject-introspection
# with GMemoryMonitor support, see:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]