diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2017-05-23 10:30:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 10:30:42 +0200 |
| commit | 435bb62f6fc3d6e7b13e774fba5ea27b22632d3f (patch) | |
| tree | bc0af86ba04d901f4c2d84e3b7d082f17953fc55 | |
| parent | f53406d82865ad2807e0891ddae1d839a7622fce (diff) | |
| parent | 08260ec20c35a3cae7659aced5b5e385f97f64ae (diff) | |
| download | astra-435bb62f6fc3d6e7b13e774fba5ea27b22632d3f.tar.gz astra-435bb62f6fc3d6e7b13e774fba5ea27b22632d3f.tar.bz2 astra-435bb62f6fc3d6e7b13e774fba5ea27b22632d3f.tar.xz astra-435bb62f6fc3d6e7b13e774fba5ea27b22632d3f.zip | |
Merge pull request #108 from wjp/travis
Travis: only install cuda packages for cuda builds
| -rw-r--r-- | .travis.yml | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 390b478..6d0a3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: python -python: - - "2.7" - - "3.5" - os: - linux @@ -13,18 +9,42 @@ addons: apt: packages: - libboost-all-dev - - nvidia-common - - nvidia-current - - nvidia-cuda-toolkit - - nvidia-cuda-dev -env: - - CUDA=yes - - CUDA=no matrix: include: - env: CUDA=no CLANG=yes - python: "3.5" + python: "3.6" + + - env: CUDA=no + python: "2.7" + + - env: CUDA=no + python: "3.6" + + - env: CUDA=yes + python: "2.7" + addons: + apt: + packages: + - libboost-all-dev + - nvidia-common + - nvidia-current + - nvidia-cuda-toolkit + - nvidia-cuda-dev + + - env: CUDA=yes + python: "3.6" + addons: + apt: + packages: + - libboost-all-dev + - nvidia-common + - nvidia-current + - nvidia-cuda-toolkit + - nvidia-cuda-dev + exclude: + - os: linux + before_install: - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then |