Revert the "containerized build" commits, because Travis still hasn't

whitelisted emacs-snapshot.

https://github.com/travis-ci/travis-ci/issues/3804

diff --git a/.travis.yml b/.travis.yml
index 2ad5bf2e955f1e1d5200c1072e7c3f5a41e9dded..bb0a9e077a3576823ffb49ee4db5aff7cb83a1c8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,24 @@
-language: emacs-lisp
+# https://github.com/rolandwalker/emacs-travis
 
-sudo: false
+language: emacs-lisp
 
-addons:
-  apt:
-    sources:
-      - cassou-emacs
+env:
+  matrix:
+    - EMACS=emacs24
+    - EMACS=emacs-snapshot
 
-matrix:
-  include:
-    - env: EMACS=emacs24
-      addons:
-        apt:
-          packages:
-            - emacs24
-            - emacs24-el
-    - env: EMACS=emacs-snapshot
-      addons:
-        apt:
-          packages:
-            - emacs-snapshot
-            - emacs-snapshot-el
-            - emacs-snapshot-gtk
+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:cassou/emacs &&
+        sudo apt-get update -qq &&
+        sudo apt-get install -qq emacs-snapshot &&
+        sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-gtk;
+    fi
 
 script:
   make test EMACS=${EMACS}