Fixed travis configuration after merge
This commit is contained in:
parent
5a2e8d0dd2
commit
2b1b6055fc
|
@ -1,20 +1,11 @@
|
||||||
language: emacs-lisp
|
language: emacs-lisp
|
||||||
sudo: false
|
sudo: false
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
env:
|
env:
|
||||||
- EVM_EMACS=emacs-25.1-travis
|
- EVM_EMACS=emacs-25.1-travis
|
||||||
>>>>>>> develop
|
|
||||||
before_install:
|
before_install:
|
||||||
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
|
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
|
||||||
- evm install $EVM_EMACS --use --skip
|
- evm install $EVM_EMACS --use --skip
|
||||||
- cask
|
- cask
|
||||||
<<<<<<< HEAD
|
|
||||||
env:
|
|
||||||
# - EVM_EMACS=emacs-24.5-travis
|
|
||||||
- EVM_EMACS=emacs-25.1-travis
|
|
||||||
=======
|
|
||||||
>>>>>>> develop
|
|
||||||
script:
|
script:
|
||||||
- emacs --version
|
- emacs --version
|
||||||
- make test
|
- make test
|
||||||
|
|
Loading…
Reference in New Issue