From bf91e3adf7c1a644588e72aee3dc84ae69be4dc4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 11 Dec 2019 14:11:08 +0100 Subject: [PATCH 1/5] ci: GMemoryMonitor support is now merged in xdg-desktop-portal --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ca71544b..fce08bec2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,7 +122,7 @@ installed-tests: # FIXME Install newer xdg-desktop-portal with # GMemoryMonitor support, see: # 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 - ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-dependency-tracking && make && sudo make install - cd .. From 5a58da36d26ac488e06c99ccdee0fa5dd353deda Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 11 Dec 2019 14:13:40 +0100 Subject: [PATCH 2/5] ci: Fix installed-tests until a newer GLib is released Force-enable portal memory monitor until 2.63.3 is released --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fce08bec2..acd9cff9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,6 +124,8 @@ installed-tests: # https://github.com/flatpak/xdg-desktop-portal/pull/365 - git clone --single-branch https://github.com/flatpak/xdg-desktop-portal.git - 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 - cd .. # FIXME install newer gobject-introspection From 4b6ad93c8690375e3ae1b26efea729fa7882fce0 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 11 Dec 2019 15:12:01 +0100 Subject: [PATCH 3/5] ci: GMemoryMonitor support is now merged in gobject-introspection --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acd9cff9b..93bd1a5cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,7 +132,7 @@ installed-tests: # with GMemoryMonitor support, see: # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193 - 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 - /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64 - ninja -C _build From c782042087578a3fd2a93e31ac5207acc402924b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 11 Dec 2019 15:18:53 +0100 Subject: [PATCH 4/5] 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: From 5a174d105d7525f9b53862d48b7a33d5974a9144 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 11 Dec 2019 17:52:24 +0100 Subject: [PATCH 5/5] ci: Fix permission error in valgrind analysis stage The valgrind analysis stage inherits from existing artefacts, so make sure to reset the permissions on the glib build directory to avoid a new build failing. $ meson ${MESON_COMMON_OPTIONS} --werror -Dsystemtap=true -Ddtrace=true -Dfam=true -Dinstalled_tests=true _build PermissionError: [Errno 13] Permission denied: '/builds/GNOME/glib/_build/meson-logs/meson-log.txt' --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6afbbe0ef..9b2b0857d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,6 +112,7 @@ installed-tests: _build - ninja -C _build - sudo ninja -C _build install + - 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