From 64e5024ce39ceff680c842a343b14ee7b628b8bf Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 24 Mar 2016 11:30:18 +0100
Subject: [PATCH] Use conan on Travis (required sudo!).
---
.travis.yml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e1512ed3029..b3c7ededee5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: false
+sudo: true
language: cpp
compiler:
@@ -21,17 +21,21 @@ cache:
- $HOME/boost_1_56_0
env:
- global:
- - VTK_DIR=$HOME/VTK-Install/lib/cmake/vtk-6.3
- - BOOST_ROOT=$HOME/boost_1_56_0
matrix:
- CASE=CLI CMAKE_ARGS="-DOGS_BUILD_GUI=OFF -DOGS_BUILD_UTILS=ON"
- CASE=GUI CMAKE_ARGS="-DOGS_BUILD_GUI=ON -DOGS_BUILD_CLI=OFF -DOGS_BUILD_TESTS=OFF"
before_install:
- bash scripts/travis/cmake.sh
- - bash scripts/travis/vtk.sh
- - bash scripts/travis/boost.sh
+
+install:
+ # Download conan
+ - wget http://downloads.conan.io/latest_debian -O conan.deb
+ - sudo dpkg -i conan.deb
+ - rm conan.deb
+
+ # Automatic detection of your arch, compiler, etc
+ - conan install -s compiler=gcc -s compiler.version=4.8
before_script:
- export PATH=$HOME/cmake-3.1.1-Linux-x86_64/bin:$PATH
--
GitLab