From 4bd8df9d09295136d3892a2ddac27a6213df4ac9 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 18 Jul 2015 05:11:15 +0300
Subject: [PATCH] Revert the "containerized build" commits, because Travis
 still hasn't whitelisted emacs-snapshot.

https://github.com/travis-ci/travis-ci/issues/3804
---
 .travis.yml | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ad5bf2e9..bb0a9e077 100644
--- 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}
-- 
2.39.2