diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-01-23 13:27:15 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-01-23 13:27:16 -0500 |
| commit | bf07131c1d0a4e001daeee8936089f8b438b7f30 (patch) | |
| tree | d7513843f4281a30b265fe196869a25f6d2e1cca /.travis.yml | |
| parent | fdc59ffd050af9ba60a031b2799fc3f5caba1330 (diff) | |
| parent | 45c58aa6f3608224975f433e1f4e4b53aa34f97c (diff) | |
| download | googletest-bf07131c1d0a4e001daeee8936089f8b438b7f30.tar.gz googletest-bf07131c1d0a4e001daeee8936089f8b438b7f30.tar.bz2 googletest-bf07131c1d0a4e001daeee8936089f8b438b7f30.zip | |
Merge pull request #2041 from ciband:chore/fix_library_json
PiperOrigin-RevId: 230554814
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 3c52e78c..fd8f7c65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,9 +46,9 @@ matrix: 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=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - os: osx - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 if: type != pull_request # These are the install and build (script) phases for the most common entries in the matrix. They could be included |