diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-07 11:05:28 +0200 |
|---|---|---|
| committer | Herbert Thielen <thielen@hs-worms.de> | 2017-09-07 11:05:28 +0200 |
| commit | bc60b5a82704c611abab34b3eeb496edf8521015 (patch) | |
| tree | ae2100d3b8c74a585a8eae3885f5fa57ce045b84 /.travis.yml | |
| parent | 55fd999adf5a8ecfcd502f07b0ea4b691ca7215f (diff) | |
| parent | a33b6b091999d44f771761be03beb64d3af2350a (diff) | |
| download | googletest-bc60b5a82704c611abab34b3eeb496edf8521015.tar.gz googletest-bc60b5a82704c611abab34b3eeb496edf8521015.tar.bz2 googletest-bc60b5a82704c611abab34b3eeb496edf8521015.zip | |
Merge branch 'master' into hethi/travis-release-build
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 81692dd9..db1338df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,11 @@ install: # /usr/bin/gcc is 4.6 always, but gcc-X.Y is available. - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi # /usr/bin/clang is 3.4, lets override with modern one. -- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi +- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; ln -sf /usr/bin/ccache /$HOME/bin/$CXX; ln -sf /usr/bin/ccache /$HOME/bin/$CC; fi +# ccache on OS X needs installation first +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install ccache; export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi +# reset ccache statistics +- ccache --zero-stats - echo ${PATH} - echo ${CXX} - ${CXX} --version @@ -30,6 +34,10 @@ os: - linux - osx language: cpp +cache: ccache +before_cache: + # print statistics before uploading new cache + - ccache --show-stats compiler: - gcc - clang |