From b3af64c20c49496d9aca358b0fc8b0a770d6f523 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 27 Jul 2016 14:46:33 -0400 Subject: [PATCH] More travis experiments. --- .travis.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7ee8b6..79980a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +# Use new trusty images, should yield newer compilers and packages +sudo: required +dist: precise language: cpp branches: @@ -5,29 +8,7 @@ branches: - master - develop - feature-travis - -os: -- linux -before_install: - - sudo apt-get update - - sudo apt-get install build-essential - -install: - - 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 libboost-all-dev - -before_script: - - git clone https://github.com/Itseez/opencv.git - - cd opencv - - mkdir build - - cd build - - cmake .. - - make -j4 - - sudo make -j4 install - - cd ../.. - matrix: include: - compiler: gcc @@ -48,6 +29,25 @@ matrix: - clang-3.7 env: COMPILER=clang++-3.7 + before_install: + - sudo apt-get update + - sudo apt-get install build-essential + +install: + - 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 libboost-all-dev + +before_script: + - git clone https://github.com/Itseez/opencv.git + - cd opencv + - mkdir build + - cd build + - cmake .. + - make -j4 + - sudo make -j4 install + - cd ../.. + script: - mkdir build - cd build