summaryrefslogtreecommitdiff
path: root/.ci/ci-make-distcheck.sh
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-11-07 17:06:10 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-11-23 14:38:26 +0100
commit8d1a1f603b1d3482158e7bfb05470de65ac0d2d3 (patch)
tree51fd36204f09e9f379ed8acd448e4816b5fb681a /.ci/ci-make-distcheck.sh
parentdefded25ebe6d16a675ee968f8fc0f785310ccdf (diff)
ci: here comes ninja!
this updates the scripts in order to make ninja all / ninja test work as expected. For now there are 2 new jobs options-enabled and options-disabled. mingw and osx will follow in another commit. Benchmarks are disabled for now, as the eina benchmark does not seem to terminate. Differential Revision: https://phab.enlightenment.org/D7255
Diffstat (limited to '.ci/ci-make-distcheck.sh')
-rwxr-xr-x.ci/ci-make-distcheck.sh27
1 files changed, 20 insertions, 7 deletions
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 83541ba..59b096a 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -6,14 +6,27 @@ if [ "$1" != "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold distcheck "make distcheck" 8travis_fold distcheck "make distcheck"
9if [ "$BUILDSYSTEM" = "ninja" ] ; then
9if [ "$DISTRO" != "" ] ; then 10if [ "$DISTRO" != "" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
11 --env CXX="ccache g++" \ 12 --env CXX="ccache g++" \
12 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 13 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
13 --env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \ 14 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
14 (sudo cat efl-*/_build/sub/src/test-suite.log; false) 15 (sudo cat efl-*/_build/sub/src/test-suite.log; false)
16 else
17 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
18 ninja -C build dist
19 fi
15else 20else
16 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 21 if [ "$DISTRO" != "" ] ; then
17 make 22 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
23 --env CXX="ccache g++" \
24 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
25 --env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \
26 (sudo cat efl-*/_build/sub/src/test-suite.log; false)
27 else
28 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
29 make
30 fi
18fi 31fi
19travis_endfold distcheck 32travis_endfold distcheck