Skip to content

Commit 35ddbe7

Browse files
Merge branch 'master' into evil-ex-grammar
2 parents 30ab139 + c861d2f commit 35ddbe7

17 files changed

+437
-2740
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212
*.vr
1313
*.vrs
1414
.depend
15+
evil-autoloads.el
16+
test-results.txt
17+
typescript

.travis.yml

+15-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,29 @@
1-
language: generic
2-
sudo: true
1+
language: nix
2+
3+
os:
4+
- linux
35

46
env:
5-
global:
6-
- CURL="curl -fsSkL --retry 9 --retry-delay 9"
7-
matrix:
8-
- EMACS_VERSION=24.3
9-
- EMACS_VERSION=24.5
10-
- EMACS_VERSION=25.3
11-
- EMACS_VERSION=26.1
12-
- EMACS_VERSION=master
7+
- EMACS_CI=emacs-24-5
8+
- EMACS_CI=emacs-25-3
9+
- EMACS_CI=emacs-26-3
10+
- EMACS_CI=emacs-snapshot
1311

1412
matrix:
1513
allow_failures:
16-
- env: EMACS_VERSION=master
17-
18-
before_install:
19-
- sudo apt-get update
20-
- sudo apt-get install -y aspell aspell-en # required for flyspell test
14+
- env: EMACS_CI=emacs-snapshot
2115

2216
install:
23-
- $CURL -O https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz
24-
- tar -xaf emacs-bin-${EMACS_VERSION}.tar.gz -C /
25-
- export EMACS=/tmp/emacs/bin/emacs
17+
- bash <(curl https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install)
2618

2719
script:
28-
- $EMACS --version
29-
- emacs=$EMACS make test
20+
- emacs --version
21+
- script -eqc 'make test' > /dev/null
22+
23+
after_script:
24+
- cat test-results.txt
3025

3126
notifications:
3227
email:
33-
# Default is change, but that includes a new branch's 1st success.
3428
on_success: never
3529
on_failure: always

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extensions. Also see our page on [EmacsWiki](http://emacswiki.org/emacs/Evil).
1515
Evil lives in a git repository. To download Evil, do
1616

1717
```
18-
git clone https://github.com/emacs-evil/evil ~/.emacs.d/evil
18+
git clone --depth 1 https://github.com/emacs-evil/evil ~/.emacs.d/evil
1919
```
2020

2121
# Install

0 commit comments

Comments
 (0)