CI: use "emacs-travis" instead of EVM

2 files changed, 24 insertions, 21 deletions

diff --git a/.travis.yml b/.travis.yml
index 86ba202..0658cf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,23 @@
 language: generic
 sudo: false
 
+env:
+  global:
+    - CURL="curl -fsSkL --retry 9 --retry-delay 9"
+  matrix:
+  - EMACS_VERSION=24.3
+  - EMACS_VERSION=24.4
+  - EMACS_VERSION=24.5
+  - EMACS_VERSION=25.1
+  - EMACS_VERSION=25.2
+  - EMACS_VERSION=master
+
+matrix:
+  allow_failures:
+    - env: EMACS_VERSION=master
+    # Emacs 25.1 segfaults when running make test
+    - env: EMACS_VERSION=25.1
+
 # NOTE: flyspell test
 addons:
   apt:
@@ -8,25 +25,11 @@ addons:
       - aspell
       - aspell-en
 
-before_install:
-  - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
-  - evm install $EVM_EMACS --use --skip
-  - cask --debug
-
-env:
-  matrix:
-    - EVM_EMACS=emacs-24.3-travis
-    - EVM_EMACS=emacs-24.4-travis
-    - EVM_EMACS=emacs-24.5-travis
-    - EVM_EMACS=emacs-25.1-travis
-    - EVM_EMACS=emacs-git-snapshot-travis
-
-# FIXME: Emacs 25.1 segfaults when running make test.
-matrix:
-  allow_failures:
-    - env: EVM_EMACS=emacs-25.1-travis
-    - env: EVM_EMACS=emacs-git-snapshot-travis
+install:
+  - $CURL -O https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz
+  - tar -xaf emacs-bin-${EMACS_VERSION}.tar.gz -C /
+  - export EMACS=/tmp/emacs/bin/emacs
 
 script:
-  - emacs --version
-  - make test
+  - $EMACS --version
+  - emacs=$EMACS make test
diff --git a/Makefile b/Makefile
index eafd2c0..9371899 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SHELL = /bin/sh
-EMACS = emacs
+EMACS ?= emacs
 FILES = $(filter-out evil-test-helpers.el evil-tests.el evil-pkg.el,$(wildcard evil*.el))
 VERSION := $(shell sed -ne '/define-package/,$$p' evil-pkg.el | sed -ne '/^\s*"[[:digit:]]\+\(\.[[:digit:]]\+\)*"\s*$$/ s/^.*"\(.*\)".*$$/\1/p')
 ELPAPKG = evil-$(VERSION)