diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-19 14:00:54 -0400 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2019-03-21 10:14:51 +0100 |
commit | 13327b4fee9aeb352b4d22d368ce5bf370f51822 (patch) | |
tree | 92df86dcc3fe0474670120e04e7da1dd826b74d9 | |
parent | e0511c995fa72a395b2dc45ad8ce3c40329a4029 (diff) | |
download | efl-13327b4fee9aeb352b4d22d368ce5bf370f51822.tar.gz |
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 <stefan@datenfreihafen.org>
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D8416
-rwxr-xr-x | .ci/configure.sh | 5 |
1 files 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 |