diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-08 11:38:27 +0200 |
|---|---|---|
| committer | Herbert Thielen <thielen@hs-worms.de> | 2017-09-08 11:38:27 +0200 |
| commit | 8620328bcae4d753bf8bee6a46b01b4e77613934 (patch) | |
| tree | 3aa4b540ae6e8e7db689b2ca2197c6f4a4381e4c /.travis.yml | |
| parent | be94bf501e649dfa6790b3cce2bbe300949b6e74 (diff) | |
| parent | 894cdb82cb2a1141bde8710a67ea4c5325d1d202 (diff) | |
| download | googletest-8620328bcae4d753bf8bee6a46b01b4e77613934.tar.gz googletest-8620328bcae4d753bf8bee6a46b01b4e77613934.tar.bz2 googletest-8620328bcae4d753bf8bee6a46b01b4e77613934.zip | |
Merge branch 'master' into hethi/cleanup-travis-environment
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 27094676..418720fd 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 @@ -22,14 +26,16 @@ addons: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.7 packages: - - gcc-4.9 - g++-4.9 - clang-3.7 - - valgrind os: - linux - osx language: cpp +cache: ccache +before_cache: + # print statistics before uploading new cache + - ccache --show-stats compiler: - gcc - clang @@ -37,7 +43,7 @@ script: ./travis.sh env: matrix: - BUILD_TYPE=Debug VERBOSE=1 - - BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 + - BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 notifications: email: false sudo: false |