Skip to content

Commit

Permalink
Update Travis config
Browse files Browse the repository at this point in the history
I have re enabled the llvm toolchain in the travis config. The problems
with llvm apt repository have been resolved.

Using cmake 3.6.2 for travis builds

Signed-off-by: Christian Rapp <[email protected]>
  • Loading branch information
crapp committed Nov 1, 2016
1 parent 6b0a21b commit 204ecf8
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@ matrix:
packages:
- g++-6
env: COMPILER=g++-6
#- os: linux
#compiler: clang
#addons:
#apt:
#sources:
#- ubuntu-toolchain-r-test
#- llvm-toolchain-precise-3.6
#packages:
#- clang-3.6
#env: COMPILER=clang++-3.6
#- os: linux
#compiler: clang
#addons:
#apt:
#sources:
#- ubuntu-toolchain-r-test
#- llvm-toolchain-precise-3.7
#packages:
#- clang-3.7
#env: COMPILER=clang++-3.7
- os: linux
compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7
packages:
- clang-3.7
env: COMPILER=clang++-3.7
- os: linux
compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
packages:
- clang-3.8
env: COMPILER=clang++-3.8
- os: osx
compiler: clang
osx_image: xcode6.4
Expand All @@ -65,8 +65,8 @@ matrix:
install:
- |
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
CMAKE_URL="https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.sh"
CMAKE_INSTALLER="cmake-3.5.2-Linux-x86_64.sh"
CMAKE_URL="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.sh"
CMAKE_INSTALLER="cmake-3.6.2-Linux-x86_64.sh"
wget --no-check-certificate --quiet -O ${CMAKE_INSTALLER} - ${CMAKE_URL}
sh ${CMAKE_INSTALLER} --prefix=$HOME --exclude-subdir
else
Expand Down

0 comments on commit 204ecf8

Please sign in to comment.