X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/dea7474d33b5164c40cee3e557eb287913da566f..971eea5ba3ff339ea6129cebff1fa2457fc9a6dc:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index a717d5728..6993df89f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,48 +1,24 @@
 # https://github.com/rolandwalker/emacs-travis
 
-language: emacs-lisp
+language: generic
 
 env:
   matrix:
-    - EMACS=emacs22
-    - EMACS=emacs23
     - EMACS=emacs24
     - EMACS=emacs-snapshot
 
 install:
-  - if [ "$EMACS" = "emacs22" ]; then
-        curl -Os http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22_22.2-0ubuntu9_i386.deb &&
-        curl -Os http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-bin-common_22.2-0ubuntu9_i386.deb &&
-        curl -Os http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-common_22.2-0ubuntu9_all.deb &&
-        curl -Os http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-el_22.2-0ubuntu9_all.deb &&
-        curl -Os http://security.ubuntu.com/ubuntu/pool/universe/e/emacs22/emacs22-gtk_22.2-0ubuntu9_i386.deb &&
-        sudo apt-get update -qq &&
-        sudo apt-get remove -qq emacs emacs23-bin-common emacs23-common emacs23-nox &&
-        sudo apt-get install -qq libjpeg62 xaw3dg &&
-        sudo dpkg -i emacs22_22.2-0ubuntu9_i386.deb emacs22-bin-common_22.2-0ubuntu9_i386.deb emacs22-common_22.2-0ubuntu9_all.deb emacs22-el_22.2-0ubuntu9_all.deb emacs22-gtk_22.2-0ubuntu9_i386.deb &&
-        sudo update-alternatives --set emacs22 /usr/bin/emacs22-gtk;
-    fi
-  - if [ "$EMACS" = "emacs23" ]; then
-        sudo apt-get update -qq &&
-        sudo apt-get install -qq emacs23-gtk emacs23-el;
-    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;
     fi
   - if [ "$EMACS" = "emacs-snapshot" ]; then
-        sudo add-apt-repository -y ppa:cassou/emacs &&
+        sudo add-apt-repository -y ppa:ubuntu-elisp/ppa &&
         sudo apt-get update -qq &&
-        sudo apt-get install -qq emacs-snapshot &&
-        sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-gtk;
+        sudo apt-get -qq -f install &&
+        sudo apt-get install -qq emacs-snapshot;
     fi
 
-before_script:
-  make downloads
-
 script:
   make test-batch EMACS=${EMACS}
-
-notifications:
-  email: false