From ed8d1ffef04e9492ea69ea6190afefa3a281329b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 11 Dec 2015 06:40:15 +0100
Subject: [PATCH] Improved travis Build relying on container and EVM

---
 .travis.yml         | 22 +++++++++++++++++-----
 travis/run_build.sh |  9 ++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4af61935c..017316d07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,25 @@
+language: generic
+sudo: false
+
 branches:
   only:
     - master
     - develop
 
 before_install:
-  sudo add-apt-repository -y ppa:ubuntu-elisp/ppa &&
-  sudo apt-get -qq update &&
-  sudo apt-get -qq -f install &&
-  sudo apt-get -qqy install emacs-snapshot;
+ - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
+ - evm install $EVM_EMACS --use --skip
+
+env:
+ - EVM_EMACS=emacs-24.4-travis
+ - EVM_EMACS=emacs-24.5-travis
+ - EVM_EMACS=emacs-git-snapshot-travis
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    env:
+      - EVM_EMACS=emacs-git-snapshot-travis
 
 script:
-  ./travis/run_build.sh
+  - ./travis/run_build.sh
diff --git a/travis/run_build.sh b/travis/run_build.sh
index 6a52d9e92..967d3a9b5 100755
--- a/travis/run_build.sh
+++ b/travis/run_build.sh
@@ -19,17 +19,20 @@ if [ $USER != "travis" ]; then
     exit 1
 fi
 
-ln -s `pwd` ~/.emacs.d
+echo "Pwd $(pwd)"
+rm -rf ~/.emacs.d
+ln -sf `pwd` ~/.emacs.d
 
 for test in "${tests[@]}"; do
     rm -rf ~/.emacs.d/elpa
     rm -rf ~/.emacs.d/.cache
-    rm ~/.spacemacs
+    rm -f ~/.spacemacs
 
     testdir=~/.emacs.d/tests/$test
+    echo "Running '$test' in '$testdir' folder"
     if [ -f $testdir/dotspacemacs.el ]; then
         cp $testdir/dotspacemacs.el ~/.spacemacs
     fi
-    cd $testdir
+    cd $testdir && echo "Now in $(pwd)"
     make test || exit 2
 done