branch: elpa/swift-mode
commit 78cea9d79c8055d5ee0032d9f3457d257dda96ee
Author: taku0 <mxxouy6x3m_git...@tatapa.org>
Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Improve CI
Incorporating a part of proposal by @AdrieanKhisbe (#124).
---
.travis.yml | 18 +++++++++++++-----
Makefile | 5 ++---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3bb5ffc..a84c4dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,16 @@
-language: emacs-lisp
+language: generic
+sudo: false
env:
- - EVM_EMACS=emacs-24.4-bin
+ - EVM_EMACS=emacs-24.4-travis
+ - EVM_EMACS=emacs-24.5-travis
+ - EVM_EMACS=emacs-25.1-travis
+ - EVM_EMACS=emacs-git-snapshot
before_install:
- - sudo mkdir /usr/local/evm
- - sudo chown travis:travis /usr/local/evm
- curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
- export PATH="/home/travis/.evm/bin:$PATH"
+ - evm config path /tmp
- evm install $EVM_EMACS --skip --use
- curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
- export PATH="/home/travis/.cask/bin:$PATH"
@@ -16,5 +19,10 @@ before_install:
- emacs --version
- cask --version
+matrix:
+ fast_finish: true
+ allow_failures:
+ - env: EVM_EMACS=emacs-git-snapshot
+
script:
- - make check
+ - make test
diff --git a/Makefile b/Makefile
index 9086362..973d580 100644
--- a/Makefile
+++ b/Makefile
@@ -47,10 +47,9 @@ clean:
## Cleans the dist directory.
rm -rf dist
-check: deps
+test: deps
## Tests the package.
$(CASK) exec $(EMACS) --batch -q \
- --eval "(add-to-list 'load-path \""$(shell realpath .)"\")" \
- -l swift-mode.el \
+ --eval "(add-to-list 'load-path \""$(shell readlink -f .)"\")" \
-l test/swift-mode-test-indent.el \
-f swift-mode:run-test:indent
