From: João Távora <joaotavora@gmail.com>
Date: Sun, 27 Apr 2014 00:49:12 +0000 (+0100)
Subject: Simpler, more effective .travis file
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/4d9eee93ba855d1ae5700620a93ea8a1998f0bf1

Simpler, more effective .travis file

* .travis.yml (env): New section.
(install): Simpler install recipes.
(script): Just rake compile and rake tests.
---

diff --git a/.travis.yml b/.travis.yml
index 83990f6d1..4bd79405d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
 language: emacs
-before_install:
-  - echo -e "\ndeb http://us.archive.ubuntu.com/ubuntu raring universe multiverse main" | sudo tee -a /etc/apt/sources.list
-  - echo -e "\ndeb http://emacs.naquadah.org/ stable/" | sudo tee -a /etc/apt/sources.list
-  - echo -e "\ndeb-src http://emacs.naquadah.org/ stable/" | sudo tee -a /etc/apt/sources.list
-  - cat /etc/apt/sources.list
-  - wget -q -O - http://emacs.naquadah.org/key.gpg | sudo apt-key add -
-  - sudo apt-get update
+
+env:
+  - "EMACS=emacs23"
+  - "EMACS=emacs24"
+
 install:
-  - sudo apt-get install emacs
-  - sudo apt-get -t raring install libgnutls26
-  - sudo apt-get install emacs-snapshot-nox
-  - curl -O https://raw.github.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el
-  - curl -O https://raw.github.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert-x.el
-  - curl -o cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.3.el
-before_script:
+  - if [ "$EMACS" = "emacs23" ]; then
+        sudo apt-get -qq update &&
+        sudo apt-get -qq -f install &&
+        sudo apt-get -qq install emacs23-nox &&
+        curl -LO https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el &&
+        curl -LO https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert-x.el &&
+        curl -Lo cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.5.el;
+    fi
+  - if [ "$EMACS" = "emacs24" ]; then
+        sudo add-apt-repository -y ppa:cassou/emacs &&
+        sudo apt-get -qq update &&
+        sudo apt-get -qq -f install &&
+        sudo apt-get -qq install emacs24-nox;
+    fi
+
 script:
-  - export EMACS=emacs; rm *.elc; rake compile; rake tests
-  - rm ert*.el; rm cl-lib.el
-  - export EMACS=emacs-snapshot; rm *.elc; rake compile; rake tests
-notifications:
-  email:
-    - joaotavora@gmail.com
+  - rake compile; rake tests