From 13327b4fee9aeb352b4d22d368ce5bf370f51822 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 19 Mar 2019 14:00:54 -0400 Subject: [PATCH] ci: disable exit-on-error during configure and also grab stderr this should resolve some issues where ci was not correctly detecting changes in env and clearing the config cache during autotools build Reviewed-by: Stefan Schmidt Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D8416 --- .ci/configure.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.ci/configure.sh b/.ci/configure.sh index fc2b231081..bdc2d85274 100755 --- a/.ci/configure.sh +++ b/.ci/configure.sh @@ -1,9 +1,8 @@ -#!/bin/bash - +#!/bin/bash +e set -o pipefail export TEST_VAR=1 -if ! ./configure $@ | tee -a configlog ; then +if ! ./configure $@ 2>&1 | tee -a configlog ; then if grep -q 'configure: error: changes in the environment can compromise the build' configlog ; then echo "clearing config.cache and retrying..." rm -f configlog config.cache