From 2714a2d46abffba826a34f72037934f95b87ce8f Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Sun, 17 Dec 2017 21:04:47 +0000 Subject: [PATCH] Yet another travis attempt. --- .travis.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbbc21a..5acfe9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: cpp +dist: trusty +sudo: required + branches: only: - master @@ -16,12 +19,12 @@ before_install: # OpenCV dependencies and boost - if [ ${TRAVIS_OS_NAME} = linux ]; then - apt-get install libopenblas-dev; - apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; - apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall; - apt-get install cmake; - apt-get update; - apt-get install libboost1.55-all-dev; + sudo apt-get update; + sudo apt-get install libopenblas-dev; + sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; + sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall; + sudo apt-get install cmake; + sudo apt-get install libboost1.55-all-dev; wget https://github.com/Itseez/opencv/archive/3.1.0.zip; unzip 3.1.0.zip; opencv-3.1.0; @@ -33,7 +36,7 @@ before_install: - if [ "$CXX" = "g++" ]; then if [ ${TRAVIS_OS_NAME} = linux ]; then $CXX --version; - cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..; + sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..; fi fi @@ -41,20 +44,20 @@ before_install: - if [ "$CXX" = "clang++" ]; then if [ ${TRAVIS_OS_NAME} = linux ]; then $CXX --version; - cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D WITH_TBB=ON ..; + sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D WITH_TBB=ON ..; fi fi - if [ ${TRAVIS_OS_NAME} = osx ]; then - brew update; - brew install tbb; - brew tap homebrew/science - brew install opencv3 --HEAD; + sudo brew update; + sudo brew install tbb; + sudo brew tap homebrew/science + sudo brew install opencv3 --HEAD; fi before_script: - - make -j4 - - make install + - sudo make -j4 + - sudo make install - cd ../.. script: