[glib/wip/hadess/add-memory-monitor: 2/2] fixup! 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: 2/2] fixup! ci: Add dependencies for newer installed tests
- Date: Thu, 21 Nov 2019 09:43:40 +0000 (UTC)
commit aebfcc9cbbe37bfcc376f47253b9ffbed0244663
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 21 10:43:13 2019 +0100
fixup! ci: Add dependencies for newer installed tests
.gitlab-ci.yml | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7dd7bdcf..abd54793c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,9 +88,8 @@ installed-tests:
except:
- tags
before_script:
- - dnf install -y gnome-desktop-testing python-dbusmock xdg-desktop-portal
- # FIXME Update python-dbusmock
- - rpm -Uvh
https://kojipkgs.fedoraproject.org//work/tasks/680/39010680/python3-dbusmock-0.18.3-2.fc32.noarch.rpm
+ # FIXME move to docker image
+ - sudo dnf install -y gnome-desktop-testing python3-dbusmock xdg-desktop-portal
script:
- meson ${MESON_COMMON_OPTIONS}
--werror
@@ -100,15 +99,27 @@ installed-tests:
_build
- ninja -C _build install
# FIXME install libportal
- - git clone git github com:flatpak/libportal.git
+ - git clone https://github.com/flatpak/libportal.git
- cd libportal/
- - meson ${MESON_COMMON_OPTIONS} _build
- - ninja -C _build install
+ - 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
- - git clone --single-branch --branch wip/hadess/memory-monitor git github
com:flatpak/xdg-desktop-portal.git
+ - sudo dnf install -y autoconf automake gettext-devel libtool diffutils fontconfig-devel json-glib-devel
geoclue2-devel pipewire-devel fuse-devel make
+ - 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 && make && make install
+ - ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-dependency-tracking && make && sudo make
install
+ # FIXME install newer gobject-introspection
+ - 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 ${MESON_COMMON_OPTIONS} _build --prefix=/usr --libdir=/usr/lib64
+ - ninja -C _build
+ - sudo ninja -C _build install
+ - cd ..
+ # FIXME Update python-dbusmock
+ - sudo dnf install -y
https://kojipkgs.fedoraproject.org//work/tasks/2365/39162365/python3-dbusmock-0.18.3-2.fc31.noarch.rpm
- gnome-desktop-testing-runner glib
artifacts:
reports:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]