summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-06-02 16:03:00 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-06-08 09:45:14 +0200
commitead6193504d4f742ff2adc9e5445a2d16fcddf7d (patch)
treea7c180964b39035fc386029cd6670af71b30c835
parent816b3b36379b2eafc2cd91cd9d63597996f45a2a (diff)
ci: travis: add more fold and timing markers in some forgotten places
In teh initial patch we forgot some interesting places we also want to fold and get timing info on. Dependency installation, cross native build step, coverity tools download and codecov run. Differential Revision: https://phab.enlightenment.org/D11938
-rwxr-xr-x.ci/ci-configure.sh8
-rwxr-xr-x.ci/ci-make-check.sh8
-rwxr-xr-x.ci/ubuntu-bionic-install-deps.sh11
3 files changed, 22 insertions, 5 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 7b75272fb4..b19f07e5cb 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -51,14 +51,18 @@ if [ "$DISTRO" != "" ] ; then
51 elif [ "$1" = "release-ready" ]; then 51 elif [ "$1" = "release-ready" ]; then
52 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 52 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
53 elif [ "$1" = "coverity" ]; then 53 elif [ "$1" = "coverity" ]; then
54 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
55 travis_fold start "cov-download" 54 travis_fold start "cov-download"
55 travis_time_start "cov-download"
56 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
56 docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh' 57 docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
58 travis_time_finish "cov-download"
57 travis_fold end "cov-download" 59 travis_fold end "cov-download"
58 elif [ "$1" = "mingw" ]; then 60 elif [ "$1" = "mingw" ]; then
59 OPTS="$OPTS $MINGW_COPTS"
60 travis_fold start "cross-native" 61 travis_fold start "cross-native"
62 travis_time_start "cross-native"
63 OPTS="$OPTS $MINGW_COPTS"
61 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh' 64 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
65 travis_time_finish "cross-native"
62 travis_fold end "cross-native" 66 travis_fold end "cross-native"
63 fi 67 fi
64 68
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index ffdb56ab7f..17fedfea65 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -8,9 +8,9 @@ fi
8 8
9NUM_TRIES=5 9NUM_TRIES=5
10 10
11travis_fold start "ninja-test"
12travis_time_start "ninja-test"
13if [ "$1" = "codecov" ] ; then 11if [ "$1" = "codecov" ] ; then
12 travis_fold start "codecov"
13 travis_time_start "codecov"
14 for tries in $(seq 1 ${NUM_TRIES}); do 14 for tries in $(seq 1 ${NUM_TRIES}); do
15 export EFL_TEST_ECORE_CON_IPV6=1 15 export EFL_TEST_ECORE_CON_IPV6=1
16 meson test -t 120 -C build --wrapper dbus-launch && break 16 meson test -t 120 -C build --wrapper dbus-launch && break
@@ -19,9 +19,13 @@ if [ "$1" = "codecov" ] ; then
19 false 19 false
20 done 20 done
21 curl -s https://codecov.io/bash | bash -s - 21 curl -s https://codecov.io/bash | bash -s -
22 travis_time_finish "codecov"
23 travis_fold end "codecov"
22 exit 0 24 exit 0
23fi 25fi
24 26
27travis_fold start "ninja-test"
28travis_time_start "ninja-test"
25if [ "$DISTRO" != "" ] ; then 29if [ "$DISTRO" != "" ] ; then
26 for tries in $(seq 1 ${NUM_TRIES}); do 30 for tries in $(seq 1 ${NUM_TRIES}); do
27 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break 31 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
diff --git a/.ci/ubuntu-bionic-install-deps.sh b/.ci/ubuntu-bionic-install-deps.sh
index 3f08287df1..008304a15f 100755
--- a/.ci/ubuntu-bionic-install-deps.sh
+++ b/.ci/ubuntu-bionic-install-deps.sh
@@ -1,4 +1,10 @@
1#!/bin/sh 1#!/bin/bash
2
3set -e
4
5travis_fold start "bionic-deps"
6travis_time_start "bionic-deps"
7
2sudo apt-get update -y 8sudo apt-get update -y
3sudo apt-get install -y build-essential autoconf automake autopoint doxygen check libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools libopenjp2-7-dev libc6-dev libpcre3-dev 9sudo apt-get install -y build-essential autoconf automake autopoint doxygen check libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools libopenjp2-7-dev libc6-dev libpcre3-dev
4# s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1 10# s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1
@@ -8,3 +14,6 @@ else
8 sudo apt-get install -y luajit libluajit-5.1-dev 14 sudo apt-get install -y luajit libluajit-5.1-dev
9fi 15fi
10sudo pip3 install meson 16sudo pip3 install meson
17
18travis_time_finish "bionic-deps"
19travis_fold end "bionic-deps"