[elpa] externals/dash a3021eb 313/426: Merge pull request #93 from lunaryorn/patch-1

[Phillip Lord]

branch: externals/dash
commit a3021eb116a5871b2276e1b266a4a131d0cc85c4
Merge: 7185db8 0384eee
Author: Magnar Sveen <address@hidden>
Commit: Magnar Sveen <address@hidden>

    Merge pull request #93 from lunaryorn/patch-1
    
    Improve Travis CI configuration
---
 .travis.yml |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29ec693..828b89b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,15 @@
 language: emacs-lisp
 before_install:
-  - 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-el emacs-snapshot-gtk emacs-snapshot;
-    fi
-  - 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 emacs24-common-non-dfsg;
-    fi
+  # PPA for stable Emacs packages
+  - sudo add-apt-repository -y ppa:cassou/emacs
+  # PPA for Emacs nightlies
+  - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
+  # Update and install the Emacs for our environment
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq -yy ${EMACS}-nox ${EMACS}-el
 env:
-  - EMACS=emacs
+  - EMACS=emacs23
   - EMACS=emacs24
   - EMACS=emacs-snapshot
 script:
-  ./run-travis-ci.sh
\ No newline at end of file
+  ./run-travis-ci.sh