From 574ea9fedbf50e913e863c99f280d4458cd787f0 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 19 Oct 2015 22:24:36 -0400
Subject: [PATCH] travis-ci switch linux to container infrastructure

-enable ccache
---
 .travis.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b7f4fbffb..4eba662e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,10 @@ matrix:
     include:
         - os: linux
           env: SPEC=linux-g++-64 CONFIG=debug
-          sudo: true
+          sudo: false
         - os: linux
           env: SPEC=linux-g++-64 CONFIG=installer
-          sudo: true
+          sudo: false
         - os: osx
           osx_image: xcode7
           env: SPEC=macx-clang CONFIG=debug
@@ -38,8 +38,24 @@ android:
     - build-tools-21.1.1
     - android-21
 
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - ccache
+    - espeak
+    - g++-4.8
+    - gcc-4.8
+    - libc6-i386
+    - libespeak-dev
+    - libopenscenegraph-dev
+    - libsdl1.2-dev
+    - libudev-dev
+
 cache:
   - apt
+  - ccache
 
 before_install:
   - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags
@@ -49,10 +65,7 @@ before_install:
 
 install:
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-         sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
-      && sudo apt-get -qq update
-      && sudo apt-get -qq install g++-4.8 espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev
-      && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
+         wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
       && tar jxf Qt5.5.1-linux.tar.bz2 -C /tmp
       && export PATH=/tmp/Qt/5.5/gcc_64/bin:$PATH
       && export CXX="g++-4.8"
-- 
2.22.0