mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-26 07:26:15 +01:00
ci: Drop custom dependency builds from installed-tests
They were needed for `GMemoryMonitor` support. That was first included in the gobject-introspection 1.63.2 release and the xdg-desktop-portal 1.5.4 release. The Fedora 33 image we’re using for CI has versions 1.66.1 and 1.8.1. This should speed up the `installed-tests` CI jobs a bit. Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
parent
51b707bdc6
commit
e30787d604
@ -158,24 +158,6 @@ installed-tests:
|
|||||||
# Remove old headers, possibly present in current installation
|
# Remove old headers, possibly present in current installation
|
||||||
- sudo rm -f /usr/include/glib-2.0/glib/gurifuncs.h
|
- sudo rm -f /usr/include/glib-2.0/glib/gurifuncs.h
|
||||||
- sudo chown -R `id -un`:`id -gn` _build/
|
- sudo chown -R `id -un`:`id -gn` _build/
|
||||||
# FIXME Install newer xdg-desktop-portal with
|
|
||||||
# GMemoryMonitor support, see:
|
|
||||||
# https://github.com/flatpak/xdg-desktop-portal/pull/365
|
|
||||||
- git clone --branch 1.6.0 --depth 1 --no-tags https://github.com/flatpak/xdg-desktop-portal.git
|
|
||||||
- cd xdg-desktop-portal
|
|
||||||
- ./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:
|
|
||||||
# https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
|
|
||||||
- git clone --single-branch --depth 1 --no-tags 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 ..
|
|
||||||
# Work-around https://gitlab.gnome.org/GNOME/gnome-desktop-testing/merge_requests/2
|
# Work-around https://gitlab.gnome.org/GNOME/gnome-desktop-testing/merge_requests/2
|
||||||
- mkdir -p _build/installed-tests-report/logs/
|
- mkdir -p _build/installed-tests-report/logs/
|
||||||
- GLIB_TEST_COMPILATION=1 gnome-desktop-testing-runner
|
- GLIB_TEST_COMPILATION=1 gnome-desktop-testing-runner
|
||||||
|
Loading…
Reference in New Issue
Block a user