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

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index e999b40..74bf958 100755 (executable)
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -42,10 +42,10 @@ if [ "$DISTRO" != "" ] ; then
     docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
   fi
   if [ "$1" = "mingw" ]; then
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
+    docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
        $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
   else
-    docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
+    docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
       --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
       --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
   fi

diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index 7572b5a..e043e9c 100755 (executable)
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -9,7 +9,7 @@ travis_fold benchmark "make benchmark"
 echo "Nothing to do here, the benchmarks don't seem to terminate"
 #else
   #if [ "$DISTRO" != "" ] ; then
-    #docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
+    #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
   #else
     #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
     #make benchmark

diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 9876671..54e420e 100755 (executable)
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -7,7 +7,7 @@ if [ "$1" != "release-ready" ] ; then
 fi
 travis_fold distcheck "make distcheck"
 if [ "$DISTRO" != "" ] ; then
-  docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
+  docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
     --env CXX="ccache g++" \
     --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
     --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 bb17565..9b79d88 100755 (executable)
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then
 fi
 travis_fold install "make install"
 if [ "$DISTRO" != "" ] ; then
-  docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
+  docker exec --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

diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 26188d8..0735bf1 100755 (executable)
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then
 fi
 travis_fold make make
 if [ "$DISTRO" != "" ] ; then
-  docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
+  docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
 else
   export PATH="$(brew --prefix gettext)/bin:$PATH"
   ninja -C build

diff --git a/.travis.yml b/.travis.yml
index 29d7d86..1ba8163 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ dist: trusty
 
 env:
   global:
-    - MAKEFLAGS="-j5 -rR"
     - EIO_MONITOR_POLL=1
     - CC="ccache gcc"
     - CXX="ccache g++"
@@ -87,7 +86,7 @@ script:
       #if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then
         #true
       #elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then
-        #docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh
+        #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh
       #fi
 before_cache:
   - .ci/ci-ccache-stats.sh