From e30787d6040b017ad9d7def8d50a130bc603ab32 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 18 Feb 2022 01:16:58 +0000 Subject: [PATCH] ci: Drop custom dependency builds from installed-tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59f20920c..cfd955462 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,24 +158,6 @@ installed-tests: # Remove old headers, possibly present in current installation - sudo rm -f /usr/include/glib-2.0/glib/gurifuncs.h - 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 - mkdir -p _build/installed-tests-report/logs/ - GLIB_TEST_COMPILATION=1 gnome-desktop-testing-runner