summaryrefslogtreecommitdiff
path: root/.ci/ci-make.sh
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-06-18 10:20:32 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-19 13:26:06 +0200
commit90f5d5e1f16513378fe5a39ef49ac793fb3fb254 (patch)
tree105aad299b11e335bb1ab286e2e342200b746f46 /.ci/ci-make.sh
parent47ada4f72c407ddf66a060e783030ff821233225 (diff)
ci: remove autotools-related conditionals
these are no longer used by anything Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D9108
Diffstat (limited to '.ci/ci-make.sh')
-rwxr-xr-x.ci/ci-make.sh17
1 files changed, 4 insertions, 13 deletions
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 2cc6ee873f..26188d8fe3 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -6,19 +6,10 @@ if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold make make 8travis_fold make make
9if [ "$BUILDSYSTEM" = "ninja" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 if [ "$DISTRO" != "" ] ; then 10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
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
16else 11else
17 if [ "$DISTRO" != "" ] ; then 12 export PATH="$(brew --prefix gettext)/bin:$PATH"
18 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make 13 ninja -C build
19 else
20 export PATH="$(brew --prefix gettext)/bin:$PATH"
21 make
22 fi
23fi 14fi
24travis_endfold make 15travis_endfold make