Merge pull request #240 from cchampet/travis_switchToContainerBasedInfrastructure

cchampet · cchampet · commit 586d31a8db83 · 2015-09-30T10:02:15.000+02:00
Travis: switch to container-based infrastructure
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,8 @@
+# Use container-based infrastructure
+sudo: required
+services:
+  - docker
+
 language: cpp
 
 os:
@@ -34,6 +39,23 @@ matrix:
 # This results in a 2×2×2x2 build matrix.
 # Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE
 
+addons:
+  apt:
+    sources: ['kalakris-cmake']
+    packages:
+    - cmake
+    - swig
+    - python-dev
+    - python-nose
+    - freeglut3-dev
+
+cache:
+  # Caching Ubuntu packages
+  apt: true
+  # Caching other directories
+  directories:
+  - ${DEPENDENCY_INSTALL}
+
 before_script:
   - env | sort  
   - date -u
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -5,28 +5,25 @@ set -x
 
 lsb_release -a
 
-sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
-sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
-sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
-sudo apt-get update -qq
-sudo apt-get install -qq gcc g++ cmake swig swig2.0
-sudo apt-get install -qq python-dev doxygen
-sudo apt-get install -qq freeglut3-dev libxmu-dev
-sudo apt-get install -qq python-nose
-
-if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
-    export FFMPEG_VERSION=2.2.9
-    sudo wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
-    sudo bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2
-    sudo tar -xvf ffmpeg-${FFMPEG_VERSION}.tar
-    cd ffmpeg-${FFMPEG_VERSION}
-    sudo ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
-
-elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
-    export LIBAV_VERSION=11.3
-    sudo wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
-    sudo tar -xvf libav-${LIBAV_VERSION}.tar.gz
-    cd libav-${LIBAV_VERSION}
-    sudo ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+if [ ! -d "${DEPENDENCY_INSTALL}/lib/" ]; then
+
+    if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
+
+        export FFMPEG_VERSION=2.2.9
+        wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
+        bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2
+        tar -xvf ffmpeg-${FFMPEG_VERSION}.tar
+        cd ffmpeg-${FFMPEG_VERSION}
+        ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && make && make install
+
+    elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
+
+        export LIBAV_VERSION=11.3
+        wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
+        tar -xvf libav-${LIBAV_VERSION}.tar.gz
+        cd libav-${LIBAV_VERSION}
+        ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && make && make install
+
+    fi
 
 fi
