summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-11 19:00:47 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-07-26 08:55:58 +0200
commit3c762fbe1f16773acf874ec906511b8376b70719 (patch)
tree67bef62df672256c45f059408e11a5bbbce4b5d4
parent2053ccb7173f195d43f99e36318b5a9d224fa1e0 (diff)
ci: add autoconf caching
this enables caching of the autoreconf and ./configure stages of the build using autotools-provided caching mechanisms in order to speed up these steps fix T7136 Differential Revision: https://phab.enlightenment.org/D6608
-rwxr-xr-x.ci/ci-configure.sh4
-rw-r--r--.travis.yml18
2 files changed, 18 insertions, 4 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 86e280ec5f..4af6763576 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -7,7 +7,7 @@ CI_BUILD_TYPE="$1"
7export MAKEFLAGS="-j5" 7export MAKEFLAGS="-j5"
8export EIO_MONITOR_POLL=1 8export EIO_MONITOR_POLL=1
9 9
10DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings" 10DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings -C"
11 11
12WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \ 12WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
13--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl" 13--enable-wayland-ivi-shell --enable-gl-drm --with-opengl=es --enable-egl"
@@ -54,7 +54,7 @@ if [ "$DISTRO" != "" ] ; then
54 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 54 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
55 $(cat $HOME/cid) ./autogen.sh $OPTS 55 $(cat $HOME/cid) ./autogen.sh $OPTS
56else 56else
57 OSX_COPTS="--disable-cxx-bindings" 57 OSX_COPTS="--disable-cxx-bindings -C"
58 58
59 # Prepare OSX env for build 59 # Prepare OSX env for build
60 mkdir -p ~/Library/LaunchAgents 60 mkdir -p ~/Library/LaunchAgents
diff --git a/.travis.yml b/.travis.yml
index f3ba713f01..bd38420d68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
1language: c 1language: c
2cache: ccache 2cache:
3 directories:
4 - $HOME/cachedir
5 - $HOME/.ccache
6 - $HOME/autom4te.cache
3sudo: required 7sudo: required
4dist: trusty 8dist: trusty
5 9
@@ -73,10 +77,14 @@ before_script:
73 if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then 77 if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
74 docker version 78 docker version
75 docker run --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash 79 docker run --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash
76 cat $HOME/cid 80 cp $HOME/cachedir/config.cache . || true
77 fi 81 fi
78 82
79 - .ci/ci-ccache-stats.sh 83 - .ci/ci-ccache-stats.sh
84 - |
85 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
86 cp $HOME/cachedir/config.cache . || true
87 fi
80 88
81script: 89script:
82 - .ci/ci-configure.sh "$CI_BUILD_TYPE" 90 - .ci/ci-configure.sh "$CI_BUILD_TYPE"
@@ -99,9 +107,15 @@ script:
99before_cache: 107before_cache:
100 - .ci/ci-ccache-stats.sh 108 - .ci/ci-ccache-stats.sh
101 - | 109 - |
110 mkdir -p $HOME/cachedir
102 if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then 111 if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
103 sudo chown travis:travis $HOME/.ccache 112 sudo chown travis:travis $HOME/.ccache
113 mkdir -p $HOME/cachedir/
114 sudo cp config.cache $HOME/cachedir/
115 sudo chown travis:travis $HOME/cachedir/config.cache
116 sudo chown travis:travis $HOME/autom4te.cache
104 else 117 else
118 cp config.cache $HOME/cachedir
105 fi 119 fi
106 120
107after_success: 121after_success: