diff options
| author | Jonny007-MKD <Jonny007-MKD@users.noreply.github.com> | 2018-09-14 20:39:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 20:39:45 (GMT) |
| commit | 631e3a58389a21bec310470b7788b30dfa17a217 (patch) | |
| tree | 4aee2a3d4206bf44197f60b051fd8700030dbbe3 /.travis.yml | |
| parent | 1b2da360eddeb98f4ee45efabb0056cc28590760 (diff) | |
| parent | bc2d0935b74917be0821bfd834472ed9cc4a3b5b (diff) | |
| download | googletest-631e3a58389a21bec310470b7788b30dfa17a217.zip googletest-631e3a58389a21bec310470b7788b30dfa17a217.tar.gz googletest-631e3a58389a21bec310470b7788b30dfa17a217.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 4e7413a..4ec239f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,25 +32,14 @@ matrix: - os: linux group: deprecated-2017Q4 compiler: clang - env: BUILD_TYPE=Debug VERBOSE=1 - - os: linux - group: deprecated-2017Q4 - compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - os: linux compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - os: osx compiler: gcc - env: BUILD_TYPE=Debug VERBOSE=1 - - os: osx - compiler: gcc env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - os: osx - compiler: clang - env: BUILD_TYPE=Debug VERBOSE=1 - if: type != pull_request - - os: osx env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 if: type != pull_request |