diff --git a/.travis.yml b/.travis.yml index a80c21dc02e..2cbb90e0191 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,40 +3,45 @@ sudo: required language: cpp matrix: + fast_finish: true include: - - os: linux - compiler: gcc - env: COMPILER=g++ - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - env: COMPILER=g++-4.8 - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - env: COMPILER=g++-4.9 - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - env: COMPILER=g++-5 - - os: osx - compiler: clang - env: COMPILER=clang++ + - os: linux + compiler: gcc + env: COMPILER=g++ + - os: osx + compiler: clang + env: COMPILER=clang++ + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + env: COMPILER=g++-4.8 + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: COMPILER=g++-4.9 + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + env: COMPILER=g++-5 + allow_failures: + - env: COMPILER=g++-5 + - env: COMPILER=g++-4.9 + - env: COMPILER=g++-4.8 cache: apt: true diff --git a/README.md b/README.md index ed2140a3c23..b516764ab44 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Caffe2 is released under the [BSD 2-Clause license](https://github.com/Yangqing/ #### OS X - brew install gtest automake protobuf + brew install automake protobuf mkdir build && cd build cmake .. make