aboutsummaryrefslogtreecommitdiffstats
path: root/.ci/ci-make-install.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-install.sh
parenttravis: merge wayland build into misc and rename to options-enabled (diff)
downloadefl-8d1a1f603b1d3482158e7bfb05470de65ac0d2d3.tar.gz
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-install.sh')
-rwxr-xr-x.ci/ci-make-install.sh17
1 files changed, 13 insertions, 4 deletions
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index 48f311bd6b..e855ba9dcd 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -6,10 +6,19 @@ if [ "$1" = "release-ready" ] ; then
exit 0
fi
travis_fold install "make install"
-if [ "$DISTRO" != "" ] ; then
- docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install
+if [ "$BUILDSYSTEM" = "ninja" ] ; then
+ if [ "$DISTRO" != "" ] ; then
+ docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
+ else
+ export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+ ninja -C build install
+ fi
else
- export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
- make install
+ if [ "$DISTRO" != "" ] ; then
+ docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install
+ else
+ export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+ make install
+ fi
fi
travis_endfold install