[nongnu] elpa/webpaste ac24701 214/298: Merge branch 'DamienCassou-simplify-travis'

[ELPA Syncer]

branch: elpa/webpaste
commit ac2470159c9a1150833ce8263452f892ba327eb1
Merge: bf08207 b1cdedb
Author: Elis Hirwing <elis@hirwing.se>
Commit: Elis Hirwing <elis@hirwing.se>

    Merge branch 'DamienCassou-simplify-travis'
---
 .travis.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02a7429..13bac42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ matrix:
     - env: INTEGRATION=yes
 
 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
@@ -20,21 +19,18 @@ env:
 before_install:
   # Get install script
   - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > 
travis.sh && source ./travis.sh
-
-  # Install the emacs version that cask needs to have installed
-  - evm install emacs-24.4-travis --use --skip
+  # Fix cask (See 
https://github.com/cask/cask/issues/399#issuecomment-331640427)
+  - perl -ibak -lape 's{#!/usr/bin/env python}{#!/usr/bin/python}' "$(which 
cask)"
+  - emacs --version
 
 install:
   # If we're running unit-tests, install the emacs version that we're testing 
today. Otherwise go with 25.3 for integration tests
   - test -n "$EVM_EMACS" && evm install $EVM_EMACS --use --skip || evm install 
emacs-25.3-travis --use --skip
 
   # Install your dependencies
-  - EMACS="/home/travis/.evm/bin/emacs" cask install
+  - cask install
 
 script:
-  # Print travis event type (might be cron or something else)
-  - emacs --version
-
   # Run tests
-  - test -n "$EVM_EMACS"     && env CASK='EMACS=/home/travis/.evm/bin/emacs 
cask' make test            || true
-  - test -n "$INTEGRATION"   && env CASK='EMACS=/home/travis/.evm/bin/emacs 
cask' make integration     || true
+  - test -n "$EVM_EMACS"     && make test            || true
+  - test -n "$INTEGRATION"   && make integration     || true