X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/a3feaccae8c9738a3569cce5b7b2737029f51c3c..3726fe2947bfb8da67f3c551fd858c3e6f591ef0:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 33c183c24..89bf86ec9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,52 +1,23 @@
 # https://github.com/rolandwalker/emacs-travis
 
-language: emacs-lisp
+language: generic
 
 env:
   matrix:
-    - EMACS=emacs22
-    - EMACS=emacs23
     - EMACS=emacs24
     - EMACS=emacs-snapshot
 
-matrix:
-  allow_failures:
-    - env: EMACS=emacs22
-
 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 -qq update &&
-        sudo apt-get -qq remove emacs emacs23-bin-common emacs23-common emacs23-nox &&
-        sudo apt-get -qq --fix-missing install install-info emacsen-common libjpeg62:i386 xaw3dg:i386 liblockfile1:i386 libasound2:i386 libgif4:i386 libncurses5:i386 libpng12-0:i386 libtiff4:i386 libxpm4:i386 libxft2:i386 libglib2.0-0:i386 libgtk2.0-0:i386 &&
-        sudo apt-get -qq -f install &&
-        sudo dpkg -i emacs22-common_22.2-0ubuntu9_all.deb emacs22-el_22.2-0ubuntu9_all.deb &&
-        sudo dpkg -i --force-depends emacs22-bin-common_22.2-0ubuntu9_i386.deb &&
-        sudo dpkg -i emacs22_22.2-0ubuntu9_i386.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 install -qq emacs-snapshot;
     fi
 
-before_script:
-  make downloads
-
 script:
   make test-batch EMACS=${EMACS}