summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-06-19 09:26:08 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-06-19 09:26:08 -0400
commitf0f799e4a802c0aaeb08dc50103175352b13d45f (patch)
tree80123acde76840f74f54523dcac9c574186b2fa2
parenteb16fc067625d025af47bf18e312ed414b726283 (diff)
ci: remove no longer needed MAKEFLAGS env variable
Summary: This was used to pass to make and is no longer used with ninja. Depends on D9117 Reviewers: zmike, bu5hm4n Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9118
-rwxr-xr-x.ci/ci-configure.sh4
-rwxr-xr-x.ci/ci-make-benchmark.sh2
-rwxr-xr-x.ci/ci-make-distcheck.sh2
-rwxr-xr-x.ci/ci-make-install.sh2
-rwxr-xr-x.ci/ci-make.sh2
-rw-r--r--.travis.yml3
6 files changed, 7 insertions, 8 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index e999b40a44..74bf958e62 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -42,10 +42,10 @@ if [ "$DISTRO" != "" ] ; then
42 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh' 42 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
43 fi 43 fi
44 if [ "$1" = "mingw" ]; then 44 if [ "$1" = "mingw" ]; then
45 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \ 45 docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
46 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" 46 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
47 else 47 else
48 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 48 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
49 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 49 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
50 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" 50 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
51 fi 51 fi
diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index 7572b5ae51..e043e9ccdd 100755
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -9,7 +9,7 @@ travis_fold benchmark "make benchmark"
9echo "Nothing to do here, the benchmarks don't seem to terminate" 9echo "Nothing to do here, the benchmarks don't seem to terminate"
10#else 10#else
11 #if [ "$DISTRO" != "" ] ; then 11 #if [ "$DISTRO" != "" ] ; then
12 #docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark 12 #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
13 #else 13 #else
14 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 14 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
15 #make benchmark 15 #make benchmark
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 9876671d32..54e420e003 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -7,7 +7,7 @@ if [ "$1" != "release-ready" ] ; then
7fi 7fi
8travis_fold distcheck "make distcheck" 8travis_fold distcheck "make distcheck"
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 10 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
11 --env CXX="ccache g++" \ 11 --env CXX="ccache g++" \
12 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 12 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
13 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \ 13 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index bb175653db..9b79d8883f 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then
7fi 7fi
8travis_fold install "make install" 8travis_fold install "make install"
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install 10 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
11else 11else
12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
13 ninja -C build install 13 ninja -C build install
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 26188d8fe3..0735bf1ffc 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then
7fi 7fi
8travis_fold make make 8travis_fold make make
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build 10 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
11else 11else
12 export PATH="$(brew --prefix gettext)/bin:$PATH" 12 export PATH="$(brew --prefix gettext)/bin:$PATH"
13 ninja -C build 13 ninja -C build
diff --git a/.travis.yml b/.travis.yml
index 29d7d86e9d..1ba8163ca6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ dist: trusty
9 9
10env: 10env:
11 global: 11 global:
12 - MAKEFLAGS="-j5 -rR"
13 - EIO_MONITOR_POLL=1 12 - EIO_MONITOR_POLL=1
14 - CC="ccache gcc" 13 - CC="ccache gcc"
15 - CXX="ccache g++" 14 - CXX="ccache g++"
@@ -87,7 +86,7 @@ script:
87 #if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then 86 #if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then
88 #true 87 #true
89 #elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then 88 #elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then
90 #docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh 89 #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh
91 #fi 90 #fi
92before_cache: 91before_cache:
93 - .ci/ci-ccache-stats.sh 92 - .ci/ci-ccache-stats.sh