Try the new travis.yml

diff --git a/.gitignore b/.gitignore
index c531d9867f6c223be1daf0f6da7538feb11966d8..2ecd29197514b49d40954132b93d7831f675ec64 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.elc
+ert.el

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..a717d57
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,48 @@
+# https://github.com/rolandwalker/emacs-travis
+
+language: emacs-lisp
+
+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 apt-get update -qq &&
+        sudo apt-get install -qq emacs-snapshot &&
+        sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-gtk;
+    fi
+
+before_script:
+  make downloads
+
+script:
+  make test-batch EMACS=${EMACS}
+
+notifications:
+  email: false

diff --git a/Makefile b/Makefile
index db28faf606a141c993879be48d2ff1e827de37ef..f95e01eab941fed8afe3b275cc43f62125a866ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
 EMACS=emacs
+CURL=curl --silent
+ERT_URL=http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el
+
+.PHONY: ert test test-batch
 
 package: *.el
        @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \
@@ -25,3 +29,7 @@ test-batch:
        ${EMACS} -Q --batch --eval "(add-to-list 'load-path \".\")" \
        -l company-tests.el --eval "(ert-run-tests-batch-and-exit \
          '(not (tag interactive)))"
+
+downloads:
+       ${EMACS} -Q --batch -l ert ||
+       ${CURL} ${ERT_URL} > ert.el