summaryrefslogtreecommitdiff
path: root/.ci/ci-make-checkbuild.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-checkbuild.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-checkbuild.sh')
-rwxr-xr-x.ci/ci-make-checkbuild.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/.ci/ci-make-checkbuild.sh b/.ci/ci-make-checkbuild.sh
index 0fb77b1ffc..88ca687d42 100755
--- a/.ci/ci-make-checkbuild.sh
+++ b/.ci/ci-make-checkbuild.sh
@@ -9,10 +9,14 @@ if [ "$1" = "mingw" ] ; then
9 exit 0 9 exit 0
10fi 10fi
11travis_fold check-build "make check-build" 11travis_fold check-build "make check-build"
12if [ "$DISTRO" != "" ] ; then 12if [ "$BUILDSYSTEM" = "ninja" ] ; then
13 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build 13 echo "Nothing to do here"
14else 14else
15 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 15 if [ "$DISTRO" != "" ] ; then
16 make check-build 16 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build
17 else
18 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
19 make check-build
20 fi
17fi 21fi
18travis_endfold check-build 22travis_endfold check-build