luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-23 02:26:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/hadess/update-installed-tests-ci' into 'master'

Browse Source 
Update installed tests CI

See merge request GNOME/glib!1278
This commit is contained in:
Philip Withnall 2019-12-12 10:34:37 +00:00
commit 2efa399abd
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -112,25 +112,21 @@ installed-tests:
_build _build
- ninja -C _build - ninja -C _build
- sudo ninja -C _build install - sudo ninja -C _build install
# FIXME install libportal to build new xdg-desktop-portal - sudo chown -R `id -un`:`id -gn` _build/
- 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 # FIXME Install newer xdg-desktop-portal with
# GMemoryMonitor support, see: # GMemoryMonitor support, see:
# https://github.com/flatpak/xdg-desktop-portal/pull/365 # 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 - git clone --single-branch https://github.com/flatpak/xdg-desktop-portal.git
- cd xdg-desktop-portal - cd xdg-desktop-portal
- ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-dependency-tracking && make && sudo make install # 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-libportal --disable-dependency-tracking && make && sudo make install
- cd .. - cd ..
# FIXME install newer gobject-introspection # FIXME install newer gobject-introspection
# with GMemoryMonitor support, see: # with GMemoryMonitor support, see:
# https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193 # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
- sudo dnf install -y meson flex bison python3-devel - 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 - git clone --single-branch https://gitlab.gnome.org/GNOME/gobject-introspection.git
- cd gobject-introspection - cd gobject-introspection
- /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64 - /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64
- ninja -C _build - ninja -C _build