diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2019-09-04 09:01:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 09:01:03 -0400 |
| commit | af84c0fe9ec13e45f6b7f07caf144607d0b82fca (patch) | |
| tree | 7ffdd4c59fc9e309125b975ade20506dd35d1307 | |
| parent | 48290d331d923031156bbbaf8360b774bf983d1e (diff) | |
| parent | 077cba734446e749378d7bb8382f2b246360e404 (diff) | |
| download | rust-mode-af84c0fe9ec13e45f6b7f07caf144607d0b82fca.tar.gz | |
Merge pull request #319 from phillord/feature/update-emacs-versions
Feature/update emacs versions
| -rw-r--r-- | .travis.yml | 27 | ||||
| -rwxr-xr-x | run_rust_emacs_tests_docker.sh | 21 | ||||
| -rw-r--r-- | test-by-cp | 7 | ||||
| -rw-r--r-- | test-from-git | 7 |
4 files changed, 44 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 2b6e3fb..20928e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,16 @@ +dist: trusty language: generic env: - matrix: - - EMACS=emacs24 - - EMACS=emacs-snapshot - + - EVM_EMACS=emacs-25.1-travis + - EVM_EMACS=emacs-25.2-travis + - EVM_EMACS=emacs-25.3-travis + - EVM_EMACS=emacs-26.1-travis + - EVM_EMACS=emacs-26.2-travis + - EVM_EMACS=emacs-git-snapshot-travis install: - - if [ "$EMACS" = 'emacs24' ]; then - sudo add-apt-repository -y ppa:cassou/emacs && - sudo apt-get -qq update && - sudo apt-get -qq -f install && - sudo apt-get -qq install emacs24 emacs24-el; - fi - - if [ "$EMACS" = 'emacs-snapshot' ]; then - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa && - sudo apt-get -qq update && - sudo apt-get -qq -f install && - sudo apt-get -qq install emacs-snapshot && - sudo apt-get -qq install emacs-snapshot-el; - fi - + - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > travis.sh && source ./travis.sh + - evm install $EVM_EMACS --use --skip script: - ./run_rust_emacs_tests.sh diff --git a/run_rust_emacs_tests_docker.sh b/run_rust_emacs_tests_docker.sh new file mode 100755 index 0000000..606e53e --- /dev/null +++ b/run_rust_emacs_tests_docker.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +echo "Testing Local files with Emacs 26 (latest)" +docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app --entrypoint=/bin/bash silex/emacs:26.2-dev ./test-by-cp + +echo Testing Local files with Emacs 25 +docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app --entrypoint=/bin/bash silex/emacs:25.3-dev ./test-by-cp + +echo "Testing Local files with Emacs 24 (oldest)" +docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app --entrypoint=/bin/bash silex/emacs:24.5-dev ./test-by-cp + +echo "Testing commits with Emacs 26 (latest)" +docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app --entrypoint=/bin/bash silex/emacs:26.2-dev ./test-from-git + +echo Testing commits with Emacs 25 +docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app --entrypoint=/bin/bash silex/emacs:25.3-dev ./test-from-git + +echo "Testing commits with Emacs 24 (oldest)" +docker run -it --rm --name docker-cp -v `pwd`:/usr/src/app -w /usr/src/app --entrypoint=/bin/bash silex/emacs:24.5-dev ./test-from-git + + diff --git a/test-by-cp b/test-by-cp new file mode 100644 index 0000000..4fde115 --- /dev/null +++ b/test-by-cp @@ -0,0 +1,7 @@ +#!/bin/sh + +cd .. +mkdir copy +cd copy +cp -rf ../app/* . +./run_rust_emacs_tests.sh diff --git a/test-from-git b/test-from-git new file mode 100644 index 0000000..48f81e0 --- /dev/null +++ b/test-from-git @@ -0,0 +1,7 @@ +#!/bin/sh + +cd .. +mkdir git +cd git +git clone ../app . +./run_rust_emacs_tests.sh |