From 43a03acb567b34ac3a73c10f77e3a94d2a52f607 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Wed, 15 Jul 2015 13:54:41 -0700
Subject: travis-ci: switch to containerized build

Change sudo rules into the new config options so we can be run in the
containerized environment for apparently faster build times.
---
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1a9b863..3ba7769 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: android
 jdk: openjdk7
+sudo: false
 
 env:
   global:
@@ -11,10 +12,14 @@ cache:
     - $HOME/.gradle/wrapper/dists/
     - $HOME/.cache/ndk
 
-before_install:
-  # Required libs for Android build tools
-  - sudo apt-get update
-  - sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch
+addons:
+  apt:
+    packages:
+      - libgd2-xpm
+      - ia32-libs
+      - la32-libs-multiarch
+
+before_script:
   # newest Android NDK
   - mkdir -p $HOME/.cache/ndk
   - if [ `uname -m` = x86_64 ]; then curl https://dl.google.com/android/ndk/android-ndk32-${NDK_VERSION}-linux-x86_64.tar.bz2 -z $HOME/.cache/ndk/ndk-${NDK_VERSION}-64.tb2 -o $HOME/.cache/ndk/ndk-${NDK_VERSION}-64.tb2; ln -sf $HOME/.cache/ndk/ndk-${NDK_VERSION}-64.tb2 ndk.tb2; else curl https://dl.google.com/android/ndk/android-ndk32-${NDK_VERSION}-linux-x86.tar.bz2 -z $HOME/.cache/ndk/ndk-${NDK_VERSION}-32.tb2 -o $HOME/.cache/ndk/ndk-${NDK_VERSION}-32.tb2; ln -sf $HOME/.cache/ndk/ndk-${NDK_VERSION}-32.tb2 ndk.tb2; fi
-- 
cgit v1.2.3