Skip to content

Commit

Permalink
Merge branch 'master' into evil-ex-grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander-Shukaev authored Dec 4, 2019
2 parents 30ab139 + c861d2f commit 35ddbe7
Show file tree
Hide file tree
Showing 17 changed files with 437 additions and 2,740 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
*.vr
*.vrs
.depend
evil-autoloads.el
test-results.txt
typescript
36 changes: 15 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
language: generic
sudo: true
language: nix

os:
- linux

env:
global:
- CURL="curl -fsSkL --retry 9 --retry-delay 9"
matrix:
- EMACS_VERSION=24.3
- EMACS_VERSION=24.5
- EMACS_VERSION=25.3
- EMACS_VERSION=26.1
- EMACS_VERSION=master
- EMACS_CI=emacs-24-5
- EMACS_CI=emacs-25-3
- EMACS_CI=emacs-26-3
- EMACS_CI=emacs-snapshot

matrix:
allow_failures:
- env: EMACS_VERSION=master

before_install:
- sudo apt-get update
- sudo apt-get install -y aspell aspell-en # required for flyspell test
- env: EMACS_CI=emacs-snapshot

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

script:
- $EMACS --version
- emacs=$EMACS make test
- emacs --version
- script -eqc 'make test' > /dev/null

after_script:
- cat test-results.txt

notifications:
email:
# Default is change, but that includes a new branch's 1st success.
on_success: never
on_failure: always
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extensions. Also see our page on [EmacsWiki](http://emacswiki.org/emacs/Evil).
Evil lives in a git repository. To download Evil, do

```
git clone https://github.com/emacs-evil/evil ~/.emacs.d/evil
git clone --depth 1 https://github.com/emacs-evil/evil ~/.emacs.d/evil
```

# Install
Expand Down
Loading

0 comments on commit 35ddbe7

Please sign in to comment.