[elpa] master 0a212c7 11/21: Fix travis build

[Justin Burkett]

branch: master
commit 0a212c71fe4ed8bf3006f5936df7ba7c673cdcd9
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    Fix travis build
    
    Add support for 25.3. Remove for 24.3
---
 .travis.yml | 25 +++++++++----------------
 Makefile    |  6 +++---
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b22aa13..9da955d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,22 @@
-language: generic
-sudo: false
-
-branches:
-  only:
-    - master
-
-before_install:
-  - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh 
&& source ./x.sh
-  - evm install $EVM_EMACS --use --skip
-  - cask
-
+# language: emacs-lisp
 env:
-  - 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-25.2-travis
+  - EVM_EMACS=emacs-25.3-travis
   - EVM_EMACS=emacs-git-snapshot-travis
 
+before_install:
+  - git clone https://github.com/rejeep/evm.git $HOME/.evm
+  - export PATH=$HOME/.evm/bin:$PATH
+  - evm config path /tmp
+  - evm install $EVM_EMACS --use --skip
+
 matrix:
   fast_finish: true
   allow_failures:
-    env:
-      - EVM_EMACS=emacs-24.3-travis
-      - EVM_EMACS=emacs-git-snapshot-travis
+    - env: EVM_EMACS=emacs-git-snapshot-travis
 
 script:
   - emacs --version
diff --git a/Makefile b/Makefile
index facb1f8..a60edf6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 .PHONY : test
 
-EMACS ?= emacs
+emacs ?= emacs
 CASK ?= cask
 
 LOADPATH = -L .
 
 ELPA_DIR = \
-       .cask/$(shell $(EMACS) -Q --batch --eval '(princ emacs-version)')/elpa
+       .cask/$(shell $(emacs) -Q --batch --eval '(princ emacs-version)')/elpa
 
 test: elpa
-       $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) \
+       $(CASK) exec $(emacs) -Q -batch $(LOADPATH) \
                -l which-key-tests.el -f ert-run-tests-batch-and-exit
 
 elpa: $(ELPA_DIR)