diff --git a/.travis.yml b/.travis.yml index 759488d5bbd65b1edbb135453013631d575c9591..86c16a47528db8ae588d881135e566b89f6f88af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,12 @@ -sudo: required -dist: jessie language: java jdk: - oraclejdk7 - compiler: - gcc - clang - -env: - global: - - AMDAPPSDKROOT=${HOME}/AMDAPPSDK - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - opencl-headers - -cache: - directories: - - ${AMDAPPSDKROOT} - before_install: - - sudo apt-get update - - sudo apt-get install fglrx opencl-headers - - . .travis/install_amd_sdk.sh; + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + - sudo apt-get install -qq fglrx=2:8.960-0ubuntu1 opencl-headers libboost-chrono1.48-dev libboost-date-time1.48-dev libboost-test1.48-dev libboost-system1.48-dev libboost-filesystem1.48-dev libboost-timer1.48-dev libboost-program-options1.48-dev libboost-thread1.48-dev python-yaml lcov libopencv-dev g++-4.8 + - gem install coveralls-lcov + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi