summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorCNugteren <web@cedricnugteren.nl>2015-08-19 09:20:10 +0200
committerCNugteren <web@cedricnugteren.nl>2015-08-19 09:20:10 +0200
commite239c5f852c133b89ad523776ee7a413d3c4ec2b (patch)
tree740fa9d954bf4bb5cddede4c26707f927208dff1 /.travis.yml
parent4f79d13d1da0335781b748e32622538d24f8c6f9 (diff)
Now using apt-get directly in Travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml20
1 files changed, 7 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 0c9a2637..01e43360 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,20 +2,15 @@ language: cpp
compiler:
- gcc
- clang
+before_install:
+ - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ - sudo add-apt-repository -y ppa:kalakris/cmake
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq gcc-4.8 g++-4.8 clang
+ - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers
+ - sudo apt-get install -qq cmake
install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- - kalakris-cmake
- packages:
- - gcc-4.8
- - g++-4.8
- - clang
- - cmake
- - fglrx=2:8.960-0ubuntu1
- - opencl-headers
before_script:
- mkdir install
- export PATH=`pwd`/install/bin:${PATH}
@@ -28,4 +23,3 @@ script:
- make install
notifications:
email: false
-sudo: false