diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-23 17:28:26 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-23 17:28:26 -0500 |
| commit | 53e48b370c585d5552cea7538bb20db500a865d7 (patch) | |
| tree | 9578da89729927f52564c46eb7c4fd748c79ef6e | |
| parent | e952bc5a576470f3f83b6a4fdd9b0c52d5d3e37c (diff) | |
| parent | 1dbb74baf2a2d0a4e2b7f487f45c8d3875a106ae (diff) | |
| download | libgit2-53e48b370c585d5552cea7538bb20db500a865d7.tar.gz | |
Merge pull request #2727 from libgit2/cmn/travis-jobs
Regain non-threadsafe builds and make the valgrind build failable
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 589edfa36..fc513458b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: - secure: "YnhS+8n6B+uoyaYfaJ3Lei7cSJqHDPiKJCKFIF2c87YDfmCvAJke8QtE7IzjYDs7UFkTCM4ox+ph2bERUrxZbSCyEkHdjIZpKuMJfYWja/jgMqTMxdyOH9y8JLFbZsSXDIXDwqBlC6vVyl1fP90M35wuWcNTs6tctfVWVofEFbs=" matrix: - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release" - - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=ON" + - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON" matrix: fast_finish: true @@ -38,7 +38,9 @@ matrix: os: linux allow_failures: - env: COVERITY=1 - - env: VALGRIND=1 + - env: + - VALGRIND=1 + OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" install: - ./script/install-deps-${TRAVIS_OS_NAME}.sh |