diff options
| author | Stefan Schmidt <s.schmidt@samsung.com> | 2019-06-19 09:26:08 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-06-19 09:26:08 -0400 |
| commit | f0f799e4a802c0aaeb08dc50103175352b13d45f (patch) | |
| tree | 80123acde76840f74f54523dcac9c574186b2fa2 | |
| parent | eb16fc067625d025af47bf18e312ed414b726283 (diff) | |
| download | efl-f0f799e4a802c0aaeb08dc50103175352b13d45f.tar.gz | |
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.sh | 4 | ||||
| -rwxr-xr-x | .ci/ci-make-benchmark.sh | 2 | ||||
| -rwxr-xr-x | .ci/ci-make-distcheck.sh | 2 | ||||
| -rwxr-xr-x | .ci/ci-make-install.sh | 2 | ||||
| -rwxr-xr-x | .ci/ci-make.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 3 |
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 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 7572b5ae51..e043e9ccdd 100755 --- 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 9876671d32..54e420e003 100755 --- 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 bb175653db..9b79d8883f 100755 --- 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 26188d8fe3..0735bf1ffc 100755 --- 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 29d7d86e9d..1ba8163ca6 100644 --- 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 |