From b1cdedb5c5936b6514a80769a1dc0c7f7ed807e6 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 23 Oct 2017 19:48:28 +0200 Subject: [PATCH] Simplify travis file --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 324cb15..13bac42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,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