From 7263fc55913d4da24599d969dd111e30da328126 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 21 Feb 2020 18:49:56 +0100
Subject: [PATCH] ci: Don't ignore xdg-desktop-portal build failure
CI scripts are done using a shell with 'set -e' enabled, but using
'&&' means that the line won't "fail". Run the different commands
sequentially instead.
Spotted by Simon McVittie <smcv@collabora.com>
Closes: #2043
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d28f88b7e..91e5b3b72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,7 +143,9 @@ 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
- - ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-libportal --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: