forked from enlightenment/efl
ci: rename some travis fold log names and add more
Summary: For an easier to grasp travis output we are using the travis_fold and endfold markers in our scripts. Renaming a few here to match the usage of meson and ninja instead of make. Also adding a few more that have been missing. While we are add it remove a now silly extra mingw conditional. Depends on D9119 Reviewers: zmike, bu5hm4n Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9120
This commit is contained in:
parent
4279406e7d
commit
2a22b5ecef
|
@ -58,15 +58,19 @@ if [ "$DISTRO" != "" ] ; then
|
||||||
|
|
||||||
if [ "$1" = "mingw" ]; then
|
if [ "$1" = "mingw" ]; then
|
||||||
OPTS="$OPTS $MINGW_COPTS"
|
OPTS="$OPTS $MINGW_COPTS"
|
||||||
|
travis_fold cross-native cross-native
|
||||||
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
|
travis_endfold cross-native
|
||||||
if [ "$1" = "mingw" ]; then
|
travis_fold meson meson
|
||||||
docker exec --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"
|
||||||
|
travis_endfold meson
|
||||||
else
|
else
|
||||||
|
travis_fold meson meson
|
||||||
docker exec --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"
|
||||||
|
travis_endfold meson
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Prepare OSX env for build
|
# Prepare OSX env for build
|
||||||
|
@ -79,5 +83,7 @@ else
|
||||||
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
|
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
|
||||||
LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
|
LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
|
||||||
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
|
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
|
||||||
|
travis_fold meson meson
|
||||||
mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dbindings=luajit -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine
|
mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dbindings=luajit -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine
|
||||||
|
travis_endfold meson
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -5,7 +5,7 @@ set -e
|
||||||
if [ "$1" = "release-ready" ] ; then
|
if [ "$1" = "release-ready" ] ; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
travis_fold benchmark "make benchmark"
|
travis_fold benchmark "ninja 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
|
||||||
|
|
|
@ -16,7 +16,7 @@ fi
|
||||||
|
|
||||||
NUM_TRIES=5
|
NUM_TRIES=5
|
||||||
|
|
||||||
travis_fold check "make check-TESTS"
|
travis_fold check "ninja test"
|
||||||
if [ "$DISTRO" != "" ] ; then
|
if [ "$DISTRO" != "" ] ; then
|
||||||
# disable them for this distros, after meson 0.49 is out, this can be removed
|
# disable them for this distros, after meson 0.49 is out, this can be removed
|
||||||
# https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
|
# https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
|
||||||
|
|
|
@ -5,7 +5,7 @@ set -e
|
||||||
if [ "$1" != "release-ready" ] ; then
|
if [ "$1" != "release-ready" ] ; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
travis_fold distcheck "make distcheck"
|
travis_fold distcheck "ninja dist"
|
||||||
if [ "$DISTRO" != "" ] ; then
|
if [ "$DISTRO" != "" ] ; then
|
||||||
docker exec --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++" \
|
||||||
|
|
|
@ -5,7 +5,7 @@ set -e
|
||||||
if [ "$1" = "release-ready" ] ; then
|
if [ "$1" = "release-ready" ] ; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
travis_fold install "make install"
|
travis_fold install "ninja install"
|
||||||
if [ "$DISTRO" != "" ] ; then
|
if [ "$DISTRO" != "" ] ; then
|
||||||
docker exec --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
|
||||||
|
|
|
@ -5,11 +5,11 @@ set -e
|
||||||
if [ "$1" = "release-ready" ] ; then
|
if [ "$1" = "release-ready" ] ; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
travis_fold make make
|
travis_fold ninja ninja
|
||||||
if [ "$DISTRO" != "" ] ; then
|
if [ "$DISTRO" != "" ] ; then
|
||||||
docker exec --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
|
||||||
fi
|
fi
|
||||||
travis_endfold make
|
travis_endfold ninja
|
||||||
|
|
Loading…
Reference in New Issue