summaryrefslogtreecommitdiff
path: root/.ci/ci-make.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.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.sh')
-rwxr-xr-x.ci/ci-make.sh17
1 files changed, 13 insertions, 4 deletions
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index dbe1ab4..2cc6ee8 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -6,10 +6,19 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold make make 8travis_fold make make
9if [ "$DISTRO" != "" ] ; then 9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make 10 if [ "$DISTRO" != "" ] ; then
11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
12 else
13 export PATH="$(brew --prefix gettext)/bin:$PATH"
14 ninja -C build
15 fi
11else 16else
12 export PATH="$(brew --prefix gettext)/bin:$PATH" 17 if [ "$DISTRO" != "" ] ; then
13 make 18 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make
19 else
20 export PATH="$(brew --prefix gettext)/bin:$PATH"
21 make
22 fi
14fi 23fi
15travis_endfold make 24travis_endfold make