diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-03-29 13:50:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 13:50:32 -0400 |
| commit | 7888184f28509dba839e3683409443e0b5bb8948 (patch) | |
| tree | 191a8fef40228262b991d965cfe245634ec8dc2c /.travis.yml | |
| parent | 86d14079bee3c304a2c8e048d2a5d5066efda05b (diff) | |
| download | googletest-7888184f28509dba839e3683409443e0b5bb8948.tar.gz googletest-7888184f28509dba839e3683409443e0b5bb8948.tar.bz2 googletest-7888184f28509dba839e3683409443e0b5bb8948.zip | |
Include OSX builds back into PR builds
Had an instance where the breakage was not detected until the actual merge. Need to be better than that
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2fbb3b16..8913e89a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,6 @@ matrix: - os: osx compiler: gcc env: BUILD_TYPE=Debug VERBOSE=1 - if: type != pull_request - os: osx compiler: gcc env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 @@ -50,7 +49,6 @@ matrix: env: BUILD_TYPE=Debug VERBOSE=1 if: type != pull_request - os: osx - compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 if: type != pull_request |