Skip to content

Commit 78cea9d

Browse files
committed
Improve CI
Incorporating a part of proposal by @AdrieanKhisbe (#124).
1 parent 7e78225 commit 78cea9d

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
language: emacs-lisp
1+
language: generic
2+
sudo: false
23

34
env:
4-
- EVM_EMACS=emacs-24.4-bin
5+
- EVM_EMACS=emacs-24.4-travis
6+
- EVM_EMACS=emacs-24.5-travis
7+
- EVM_EMACS=emacs-25.1-travis
8+
- EVM_EMACS=emacs-git-snapshot
59

610
before_install:
7-
- sudo mkdir /usr/local/evm
8-
- sudo chown travis:travis /usr/local/evm
911
- curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
1012
- export PATH="/home/travis/.evm/bin:$PATH"
13+
- evm config path /tmp
1114
- evm install $EVM_EMACS --skip --use
1215
- curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
1316
- export PATH="/home/travis/.cask/bin:$PATH"
@@ -16,5 +19,10 @@ before_install:
1619
- emacs --version
1720
- cask --version
1821

22+
matrix:
23+
fast_finish: true
24+
allow_failures:
25+
- env: EVM_EMACS=emacs-git-snapshot
26+
1927
script:
20-
- make check
28+
- make test

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ clean:
4747
## Cleans the dist directory.
4848
rm -rf dist
4949

50-
check: deps
50+
test: deps
5151
## Tests the package.
5252
$(CASK) exec $(EMACS) --batch -q \
53-
--eval "(add-to-list 'load-path \""$(shell realpath .)"\")" \
54-
-l swift-mode.el \
53+
--eval "(add-to-list 'load-path \""$(shell readlink -f .)"\")" \
5554
-l test/swift-mode-test-indent.el \
5655
-f swift-mode:run-test:indent

0 commit comments

Comments
 (0)