[elpa] master 24e2aa7 36/78: Change to container-based Travis-CI build

[Dmitry Gutov]

branch: master
commit 24e2aa7b9011748a52dc9e2cbb8078449972528c
Author: Iku Iwasa <address@hidden>
Commit: Iku Iwasa <address@hidden>

    Change to container-based Travis-CI build
    
    Supports emacs24, emacs25 and emacs-snapshot.
---
 .travis.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6993df8..b8eb249 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,26 @@
-# https://github.com/rolandwalker/emacs-travis
+sudo: false
 
 language: generic
 
-env:
-  matrix:
-    - EMACS=emacs24
-    - EMACS=emacs-snapshot
+matrix:
+  include:
+    - env: EMACS=emacs24
+      addons:
+        apt:
+          sources: [ { sourceline: 'ppa:cassou/emacs' } ]
+          packages: [ emacs24, emacs24-el ]
+    - env: EMACS=emacs25
+      addons:
+        apt:
+          sources: [ { sourceline: 'ppa:kelleyk/emacs' } ]
+          packages: [ emacs25 ]
+    - env: EMACS=emacs-snapshot
+      addons:
+        apt:
+          sources: [ { sourceline: 'ppa:ubuntu-elisp/ppa' } ]
+          packages: [ emacs-snapshot ]
 
-install:
-  - if [ "$EMACS" = "emacs24" ]; then
-        sudo add-apt-repository -y ppa:cassou/emacs &&
-        sudo apt-get update -qq &&
-        sudo apt-get install -qq emacs24 emacs24-el;
-    fi
-  - if [ "$EMACS" = "emacs-snapshot" ]; then
-        sudo add-apt-repository -y ppa:ubuntu-elisp/ppa &&
-        sudo apt-get update -qq &&
-        sudo apt-get -qq -f install &&
-        sudo apt-get install -qq emacs-snapshot;
-    fi
+install: true
 
 script:
   make test-batch EMACS=${EMACS}