diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-10 10:42:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 10:42:25 -0500 |
| commit | 505de1d6e2018b2a6857368670a9e760b779dd02 (patch) | |
| tree | 3abacc59299c17e7f7d607f9fc80f8965329136e | |
| parent | 2f31bfab6b608f7aff323a7332075a9fcd6eb889 (diff) | |
| parent | 6eccdb7b62d52f88e673ca4f389a697729286397 (diff) | |
| download | googletest-505de1d6e2018b2a6857368670a9e760b779dd02.tar.gz googletest-505de1d6e2018b2a6857368670a9e760b779dd02.tar.bz2 googletest-505de1d6e2018b2a6857368670a9e760b779dd02.zip | |
Merge branch 'master' into master
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 180728a6..738e1194 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,28 +11,34 @@ language: cpp matrix: include: - os: linux + group: deprecated-2017Q4 compiler: gcc sudo: true cache: install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux + group: deprecated-2017Q4 compiler: clang sudo: true cache: install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux + group: deprecated-2017Q4 compiler: gcc install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-autotools.sh - os: linux + group: deprecated-2017Q4 compiler: gcc env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 - 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: osx |