summaryrefslogtreecommitdiff
path: root/.ci/ci-configure.sh
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-13 18:29:25 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-07-26 08:55:59 +0200
commitc06be53b0389a2c5d4d8cad89e53dbfe184b4298 (patch)
tree70603f5e0c491c926c3d46045ba328573bebc0f7 /.ci/ci-configure.sh
parentd568c6f1251048e0e3378beccbf9d915ce12fa28 (diff)
ci: add folding for travis logs
make the build a bit nicer to read the build output is still insanely verbose, so this isn't super useful as the 'pretty' view still takes so long to load that it's almost always better to just read the raw text log Differential Revision: https://phab.enlightenment.org/D6616
Diffstat (limited to '.ci/ci-configure.sh')
-rwxr-xr-x.ci/ci-configure.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 74f4848a2f..01a60ea749 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -2,6 +2,8 @@
2 2
3set -e 3set -e
4 4
5. .ci/travis.sh
6
5CI_BUILD_TYPE="$1" 7CI_BUILD_TYPE="$1"
6 8
7DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings -C" 9DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings -C"
@@ -47,9 +49,16 @@ if [ "$DISTRO" != "" ] ; then
47 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 49 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
48 fi 50 fi
49 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 51 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
52 travis_fold autoreconf autoreconf
53 docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
54 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
55 $(cat $HOME/cid) sh -c "autoreconf -iv"
56 travis_endfold autoreconf
57 travis_fold configure "configure $OPTS"
50 docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 58 docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
51 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 59 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
52 $(cat $HOME/cid) sh -c "autoreconf -iv && ./configure $OPTS" 60 $(cat $HOME/cid) sh -c "./configure $OPTS"
61 travis_endfold configure
53else 62else
54 OSX_COPTS="--disable-cxx-bindings --with-tests=regular -C" 63 OSX_COPTS="--disable-cxx-bindings --with-tests=regular -C"
55 64
@@ -65,6 +74,10 @@ else
65 74
66 # Normal build test of all targets 75 # Normal build test of all targets
67 rm -f ~/.ccache/ccache.conf 76 rm -f ~/.ccache/ccache.conf
77 travis_fold autoreconf autoreconf
68 autoreconf -iv 78 autoreconf -iv
79 travis_endfold autoreconf
80 travis_fold configure "configure $OSX_COPTS"
69 ./configure $OSX_COPTS 81 ./configure $OSX_COPTS
82 travis_endfold configure
70fi 83fi