summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-06-19 09:26:18 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-06-19 09:26:18 -0400
commit2a22b5ecef79dddc2e575147ae7770516e24fca0 (patch)
treea37745c6afb272d6ce31187e54a29975f43d170e
parent4279406e7de6970d1bada68b17aba5e67ec45cfc (diff)
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
-rwxr-xr-x.ci/ci-configure.sh10
-rwxr-xr-x.ci/ci-make-benchmark.sh2
-rwxr-xr-x.ci/ci-make-check.sh2
-rwxr-xr-x.ci/ci-make-distcheck.sh2
-rwxr-xr-x.ci/ci-make-install.sh2
-rwxr-xr-x.ci/ci-make.sh4
6 files changed, 14 insertions, 8 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 44dba53f23..079886b25b 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -58,15 +58,19 @@ if [ "$DISTRO" != "" ] ; then
58 58
59 if [ "$1" = "mingw" ]; then 59 if [ "$1" = "mingw" ]; then
60 OPTS="$OPTS $MINGW_COPTS" 60 OPTS="$OPTS $MINGW_COPTS"
61 travis_fold cross-native cross-native
61 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh' 62 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
62 fi 63 travis_endfold cross-native
63 if [ "$1" = "mingw" ]; then 64 travis_fold meson meson
64 docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \ 65 docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
65 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" 66 $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
67 travis_endfold meson
66 else 68 else
69 travis_fold meson meson
67 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 70 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
68 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 71 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
69 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS" 72 --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
73 travis_endfold meson
70 fi 74 fi
71else 75else
72 # Prepare OSX env for build 76 # Prepare OSX env for build
@@ -79,5 +83,7 @@ else
79 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" 83 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
80 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2) 84 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
81 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig" 85 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
86 travis_fold meson meson
82 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 87 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
88 travis_endfold meson
83fi 89fi
diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index e043e9ccdd..d1689a2844 100755
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -5,7 +5,7 @@ set -e
5if [ "$1" = "release-ready" ] ; then 5if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold benchmark "make benchmark" 8travis_fold benchmark "ninja benchmark"
9echo "Nothing to do here, the benchmarks don't seem to terminate" 9echo "Nothing to do here, the benchmarks don't seem to terminate"
10#else 10#else
11 #if [ "$DISTRO" != "" ] ; then 11 #if [ "$DISTRO" != "" ] ; then
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index bea7ca7b1a..d331993315 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -16,7 +16,7 @@ fi
16 16
17NUM_TRIES=5 17NUM_TRIES=5
18 18
19travis_fold check "make check-TESTS" 19travis_fold check "ninja test"
20if [ "$DISTRO" != "" ] ; then 20if [ "$DISTRO" != "" ] ; then
21 # disable them for this distros, after meson 0.49 is out, this can be removed 21 # disable them for this distros, after meson 0.49 is out, this can be removed
22 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be 22 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 54e420e003..637450b64d 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -5,7 +5,7 @@ set -e
5if [ "$1" != "release-ready" ] ; then 5if [ "$1" != "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold distcheck "make distcheck" 8travis_fold distcheck "ninja dist"
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 10 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
11 --env CXX="ccache g++" \ 11 --env CXX="ccache g++" \
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index 9b79d8883f..0984b06cb9 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -5,7 +5,7 @@ set -e
5if [ "$1" = "release-ready" ] ; then 5if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold install "make install" 8travis_fold install "ninja install"
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install 10 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
11else 11else
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 0735bf1ffc..0e955bc4a7 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -5,11 +5,11 @@ set -e
5if [ "$1" = "release-ready" ] ; then 5if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold make make 8travis_fold ninja ninja
9if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
10 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build 10 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
11else 11else
12 export PATH="$(brew --prefix gettext)/bin:$PATH" 12 export PATH="$(brew --prefix gettext)/bin:$PATH"
13 ninja -C build 13 ninja -C build
14fi 14fi
15travis_endfold make 15travis_endfold ninja