Compare commits

...

3 Commits

Author SHA1 Message Date
Stefan Schmidt 599e6a510d add timing for other parts 2020-06-04 16:24:33 +02:00
Stefan Schmidt ad646bba83 ci: simplify ccache setup handling
We no longer need the special case for release ready. This was needed
for the way autotools setup directories, which we no longer use. (We are
not having a config.log anymore)

Differential Revision: https://phab.enlightenment.org/D11937
2020-06-04 15:45:51 +02:00
Stefan Schmidt b644cdeb1c remove notification 2020-06-04 14:29:18 +02:00
5 changed files with 24 additions and 33 deletions

View File

@ -51,14 +51,18 @@ if [ "$DISTRO" != "" ] ; then
elif [ "$1" = "release-ready" ]; then
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
elif [ "$1" = "coverity" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
travis_fold start "cov-download"
travis_time_start "cov-download"
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
travis_time_finish "cov-download"
travis_fold end "cov-download"
elif [ "$1" = "mingw" ]; then
OPTS="$OPTS $MINGW_COPTS"
travis_fold start "cross-native"
travis_time_start "cross-native"
OPTS="$OPTS $MINGW_COPTS"
docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
travis_time_finish "cross-native"
travis_fold end "cross-native"
fi

View File

@ -8,9 +8,9 @@ fi
NUM_TRIES=5
travis_fold start "ninja-test"
travis_time_start "ninja-test"
if [ "$1" = "codecov" ] ; then
travis_fold start "codecov"
travis_time_start "codecov"
for tries in $(seq 1 ${NUM_TRIES}); do
export EFL_TEST_ECORE_CON_IPV6=1
meson test -t 120 -C build --wrapper dbus-launch && break
@ -19,9 +19,13 @@ if [ "$1" = "codecov" ] ; then
false
done
curl -s https://codecov.io/bash | bash -s -
travis_time_finish "codecov"
travis_fold end "codecov"
exit 0
fi
travis_fold start "ninja-test"
travis_time_start "ninja-test"
if [ "$DISTRO" != "" ] ; then
for tries in $(seq 1 ${NUM_TRIES}); do
(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

View File

@ -4,10 +4,5 @@ CI_BUILD_TYPE="$1"
cp .ci/ccache.conf ~/.ccache
if [ "$1" = "release-ready" ] ; then
sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
echo "base_dir = $(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" >> ~/.ccache/ccache.conf
else
sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
fi
sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
echo "base_dir = $pwd" >> ~/.ccache/ccache.conf

View File

@ -1,4 +1,10 @@
#!/bin/sh
#!/bin/bash
set -e
travis_fold start "bionic-deps"
travis_time_start "bionic-deps"
sudo apt-get update -y
sudo 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
# s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1
@ -8,3 +14,6 @@ else
sudo apt-get install -y luajit libluajit-5.1-dev
fi
sudo pip3 install meson
travis_time_finish "bionic-deps"
travis_fold end "bionic-deps"

View File

@ -58,39 +58,29 @@ jobs:
- os: linux
env: DISTRO=Fedora32 CI_BUILD_TYPE=default
- os: linux
if: type = cron
env: DISTRO=Fedora32 CI_BUILD_TYPE=release-ready
- os: linux
if: type = cron
env: DISTRO=Ubuntu2004
- os: linux
if: type = cron
env: DISTRO=Ubuntu1910
- os: linux
if: type = cron
env: DISTRO=Debian103
- os: linux
if: type = cron
env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
- os: linux
if: type = cron
env: DISTRO=Fedora32 CI_BUILD_TYPE=asan
- os: linux
if: type = cron
env: DISTRO=Fedora32-exactness CI_BUILD_TYPE=exactness
- os: linux
if: type = cron
env: CI_BUILD_TYPE=codecov
- os: linux
if: type = cron
arch: arm64
env: CI_BUILD_TYPE=default
- os: linux
if: type = cron
arch: ppc64le
env: CI_BUILD_TYPE=no-bindings
- os: linux
if: type = cron
arch: s390x
env: CI_BUILD_TYPE=no-bindings
@ -144,14 +134,3 @@ before_cache:
mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
fi
notifications:
irc:
channels:
- "chat.freenode.net#edevelop"
on_success: change
on_failure: always
template:
- "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})"
- "Commit: %{commit_subject} (%{commit}) from %{author}"
- "Change view : %{compare_url}"
- "Build details : %{build_url}"