forked from enlightenment/efl
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:
parent
eb16fc0676
commit
f0f799e4a8
|
@ -42,10 +42,10 @@ if [ "$DISTRO" != "" ] ; then
|
||||||
docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
|
docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
|
||||||
fi
|
fi
|
||||||
if [ "$1" = "mingw" ]; then
|
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"
|
$(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
|
||||||
else
|
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 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"
|
--env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -9,7 +9,7 @@ travis_fold benchmark "make benchmark"
|
||||||
echo "Nothing to do here, the benchmarks don't seem to terminate"
|
echo "Nothing to do here, the benchmarks don't seem to terminate"
|
||||||
#else
|
#else
|
||||||
#if [ "$DISTRO" != "" ] ; then
|
#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
|
#else
|
||||||
#export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
|
#export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
|
||||||
#make benchmark
|
#make benchmark
|
||||||
|
|
|
@ -7,7 +7,7 @@ if [ "$1" != "release-ready" ] ; then
|
||||||
fi
|
fi
|
||||||
travis_fold distcheck "make distcheck"
|
travis_fold distcheck "make distcheck"
|
||||||
if [ "$DISTRO" != "" ] ; then
|
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 CXX="ccache g++" \
|
||||||
--env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
|
--env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
|
||||||
--env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
|
--env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
|
||||||
|
|
|
@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then
|
||||||
fi
|
fi
|
||||||
travis_fold install "make install"
|
travis_fold install "make install"
|
||||||
if [ "$DISTRO" != "" ] ; then
|
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
|
else
|
||||||
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
|
export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
|
||||||
ninja -C build install
|
ninja -C build install
|
||||||
|
|
|
@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then
|
||||||
fi
|
fi
|
||||||
travis_fold make make
|
travis_fold make make
|
||||||
if [ "$DISTRO" != "" ] ; then
|
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
|
else
|
||||||
export PATH="$(brew --prefix gettext)/bin:$PATH"
|
export PATH="$(brew --prefix gettext)/bin:$PATH"
|
||||||
ninja -C build
|
ninja -C build
|
||||||
|
|
|
@ -9,7 +9,6 @@ dist: trusty
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- MAKEFLAGS="-j5 -rR"
|
|
||||||
- EIO_MONITOR_POLL=1
|
- EIO_MONITOR_POLL=1
|
||||||
- CC="ccache gcc"
|
- CC="ccache gcc"
|
||||||
- CXX="ccache g++"
|
- CXX="ccache g++"
|
||||||
|
@ -87,7 +86,7 @@ script:
|
||||||
#if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then
|
#if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then
|
||||||
#true
|
#true
|
||||||
#elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then
|
#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
|
#fi
|
||||||
before_cache:
|
before_cache:
|
||||||
- .ci/ci-ccache-stats.sh
|
- .ci/ci-ccache-stats.sh
|
||||||
|
|
Loading…
Reference in New Issue