Speed up travis slightly and fix documentation mistake

Summary: Closes https://github.com/caffe2/caffe2/pull/90

Differential Revision: D4404418

Pulled By: bwasti

fbshipit-source-id: a45af5624eff12abbb103f1e55d2906d35e0dee5
This commit is contained in:
Bram Wasti 2017-01-11 10:42:37 -08:00 committed by Facebook Github Bot
parent 92ebb58a06
commit 0e6ebdf50a
2 changed files with 39 additions and 34 deletions

View file

@ -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

View file

@ -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