enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Stefan Schmidt 2019-06-19 09:26:08 -04:00 committed by Mike Blumenkrantz
parent eb16fc0676
commit f0f799e4a8
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/ci-configure.sh
View File

@ -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

2
.ci/ci-make-benchmark.sh
View File

@ -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

2
.ci/ci-make-distcheck.sh
View File

@ -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 || \

2
.ci/ci-make-install.sh
View File

@ -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

2
.ci/ci-make.sh
View File

@ -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

3
.travis.yml
View File

@ -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