From 38fd75f3055838094d50d2fcfce3e188bee4719d Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 13 Feb 2018 22:39:21 +0300 Subject: [PATCH] Travis: Try fix ccache (#1900) * Travis: Try fix ccache --- .travis.yml | 2 ++ debian/pbuilder-hooks/A00ccache | 2 -- utils/travis/pbuilder.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31d42d01595..7f867dc10b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,8 @@ matrix: cache: ccache: true timeout: 1000 + directories: + - /home/travis/.ccache addons: apt: diff --git a/debian/pbuilder-hooks/A00ccache b/debian/pbuilder-hooks/A00ccache index ab5811809e9..a5d1d33b428 100755 --- a/debian/pbuilder-hooks/A00ccache +++ b/debian/pbuilder-hooks/A00ccache @@ -6,8 +6,6 @@ echo "CCACHEDIR=$CCACHEDIR CCACHE_DIR=$CCACHE_DIR SET_CCACHEDIR=$SET_CCACHEDIR" [ -z "$CCACHE_DIR" ] && export CCACHE_DIR=${CCACHEDIR:=${SET_CCACHEDIR=/var/cache/pbuilder/ccache}} -df -h - if [ -n "$CCACHE_DIR" ]; then mkdir -p $CCACHE_DIR || true chown -R $BUILDUSERID:$BUILDUSERID $CCACHE_DIR || true diff --git a/utils/travis/pbuilder.sh b/utils/travis/pbuilder.sh index 8043b2b48d4..8d7478cb8e8 100755 --- a/utils/travis/pbuilder.sh +++ b/utils/travis/pbuilder.sh @@ -19,7 +19,7 @@ env TEST_RUN=${TEST_RUN=1} \ PBUILDER_OPT="--timeout ${PBUILDER_TIMEOUT:=35m} $PBUILDER_OPT" \ `# clang faster than gcc` \ DEB_CC=${DEB_CC=$CC} DEB_CXX=${DEB_CXX=$CXX} \ - CCACHE_SIZE=${CCACHE_SIZE:=4G} SET_CCACHEDIR=${SET_CCACHEDIR=$HOME/.ccache} \ + CCACHE_SIZE=${CCACHE_SIZE:=4G} \ `# Disable all features` \ CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DUNBUNDLED=1 -DENABLE_UNWIND=0 -DENABLE_MYSQL=0 -DENABLE_CAPNP=0 -DENABLE_RDKAFKA=0 -DUSE_EMBEDDED_COMPILER=1 -DCMAKE_C_FLAGS_ADD='-O0 -g0' -DCMAKE_CXX_FLAGS_ADD='-O0 -g0' $CMAKE_FLAGS" \ `# Use all possible contrib libs from system` \