attempt to build sudo:false

2 files changed, 50 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index bf13fb517b..ac40463011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,23 +5,23 @@ git:
 addons_shortcuts:
   addons_clang38: &clang38
     apt:
-      sources:  [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ]
-      packages: [ 'clang-3.8', 'libstdc++-5-dev', 'libstdc++6', 'libllvm3.8v4', 'cmake', 'cmake-data',
+      sources:  [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'libstdc++-5-dev', 'libstdc++6', 'libllvm3.8v4',
                   'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ]
   addons_gcc5: &gcc5
     apt:
-      sources:  [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ]
-      packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', 'cmake', 'cmake-data',
+      sources:  [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4',
                   'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ]
   addons_qt4: &qt4
     apt:
-      sources:  [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ]
-      packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', 'libjemalloc-dev', 'cmake', 'cmake-data',
+      sources:  [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', 'libjemalloc-dev',
                   'mesa-utils', 'qt4-default' ]
   addons_qt5: &qt5
     apt:
-      sources:  [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ]
-      packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', 'cmake', 'cmake-data',
+      sources:  [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4',
                   'mesa-utils', 'libc6-dbg', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev', 'qtpositioning5-dev', 'qtlocation5-dev' ]
 
 env:
@@ -54,8 +54,8 @@ matrix:
   include:
     # Clang 3.8 - Debug - Node
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: node
       compiler: "node4-clang38-debug"
       env: _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1
@@ -76,8 +76,8 @@ matrix:
     # GCC 5 - Debug - Coverage
     # FIXME: https://github.com/mapbox/mapbox-gl-native/issues/6918
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "glfw-gcc5-debug"
       env: BUILDTYPE=Debug _CXX=g++-5 _CC=gcc-5 WITH_COVERAGE=1 WITH_OSMESA=1
@@ -88,8 +88,8 @@ matrix:
 
     # GCC 5 - Release
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "glfw-gcc5-release"
       env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 WITH_OSMESA=1
@@ -97,8 +97,8 @@ matrix:
 
     # Clang 3.8 - Debug
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "glfw-clang38-debug"
       env: BUILDTYPE=Debug _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1
@@ -106,8 +106,8 @@ matrix:
 
     # Clang 3.8 - Release
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "glfw-clang38-release"
       env: BUILDTYPE=Release _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1
@@ -115,8 +115,8 @@ matrix:
 
     # Clang 3.8 - check
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "check-clang38-release"
       env: BUILDTYPE=Release _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1
@@ -127,8 +127,8 @@ matrix:
 
     # Qt 4 - Release
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "qt4-gcc5-release"
       env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 RUN_XVFB=1 WITH_QT_4=1
@@ -139,8 +139,8 @@ matrix:
 
     # Qt 5 - Release
     - os: linux
-      sudo: required
-      dist: trusty
+      sudo: false
+      dist: precise
       language: cpp
       compiler: "qt5-gcc5-release"
       env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 RUN_XVFB=1
diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh
index 6c39b3f42c..26e6c9b4c6 100755
--- a/scripts/travis_setup.sh
+++ b/scripts/travis_setup.sh
@@ -1,9 +1,35 @@
 #!/usr/bin/env bash
 # This script is sourced; do not set -e or -o pipefail here.
 
+# Ensure mason is on the PATH
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+mapbox_time "checkout_mason" \
+git submodule update --init .mason
+
+# Install core build tools
+mapbox_time "install_cmake" \
+mason install cmake 3.6.2
+export PATH=$(mason prefix cmake 3.6.2)/bin:${PATH}
+which cmake
+mapbox_time "install_ccache" \
+mason install ccache 3.3.1
+export PATH=$(mason prefix ccache 3.3.1)/bin:${PATH}
+which ccache
+
 if [ ! -z "${_CXX}" ]; then export CXX="${_CXX}" ; fi
 if [ ! -z "${_CC}" ]; then export CC="${_CC}" ; fi
 
+# if clang++ is requested we install via mason
+# to allow building using a consistent method on
+# either ubuntu precise or trusty
+if [[ ${CXX} =~ "clang++" ]]; then
+    mapbox_time "install_clang++" \
+    mason install clang++ 3.8.1
+    export PATH=$(mason prefix clang++ 3.8.1)/bin:${PATH}
+    which clang++-3.8
+fi
+
 if [ "${CCACHE:-0}" -ge 1 ]; then
     export CXX="ccache ${CXX}"
     export CC="ccache ${CC}"
@@ -27,12 +53,6 @@ echo "export CXX=\"${CXX}\""
 echo "export CC=\"${CC}\""
 ${CXX} --version
 
-# Ensure mason is on the PATH
-export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
-
-mapbox_time "checkout_mason" \
-git submodule update --init .mason
-
 # Touch package.json so that we are definitely going to run an npm update action
 mapbox_time "touch_package_json" \
 touch package.json