aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-08-29 11:06:03 -0400
committerJack Lloyd <[email protected]>2017-08-29 11:06:03 -0400
commitb813d8ba8b0a7928f8bf1deffd014fd76bb84c5d (patch)
tree0062f51fc7a7a11dcedd348a994ef8d0da88a563 /src
parent5631a1bb84043f5bfbca73a2f3aca42cd323a469 (diff)
Use Xenial ccache on Travis
The Trusty ccache is too old and apparently ignores our ccache env variables.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/scripts/ci/setup_travis.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh
index 66837268a..268cd5869 100755
--- a/src/scripts/ci/setup_travis.sh
+++ b/src/scripts/ci/setup_travis.sh
@@ -4,6 +4,10 @@ which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if avai
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+ # ccache in Trusty is too old, use version from Xenial
+ wget http://mirrors.kernel.org/ubuntu/pool/main/c/ccache/ccache_3.2.4-1_amd64.deb
+ sudo dpkg -i ccache_3.2.4-1_amd64.deb
+
if [ "$BUILD_MODE" = "valgrind" ]; then
sudo apt-get -qq update
sudo apt-get install valgrind
@@ -43,10 +47,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
wget http://mirrors.kernel.org/ubuntu/pool/universe/l/lcov/lcov_1.12-2_all.deb
sudo dpkg -i lcov_1.12-2_all.deb
- # ccache in Trusty doesn't understand --coverage
- wget http://mirrors.kernel.org/ubuntu/pool/main/c/ccache/ccache_3.2.4-1_amd64.deb
- sudo dpkg -i ccache_3.2.4-1_amd64.deb
-
(cd /home/travis/bin && ln -s gcov-4.8 gcov)
pip install --user coverage