Skip to content

Commit af84c0f

Browse files
authored
Merge pull request #319 from phillord/feature/update-emacs-versions
Feature/update emacs versions
2 parents 48290d3 + 077cba7 commit af84c0f

File tree

4 files changed

+44
-18
lines changed

4 files changed

+44
-18
lines changed

.travis.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1+
dist: trusty
12
language: generic
23

34
env:
4-
matrix:
5-
- EMACS=emacs24
6-
- EMACS=emacs-snapshot
7-
5+
- EVM_EMACS=emacs-25.1-travis
6+
- EVM_EMACS=emacs-25.2-travis
7+
- EVM_EMACS=emacs-25.3-travis
8+
- EVM_EMACS=emacs-26.1-travis
9+
- EVM_EMACS=emacs-26.2-travis
10+
- EVM_EMACS=emacs-git-snapshot-travis
811
install:
9-
- if [ "$EMACS" = 'emacs24' ]; then
10-
sudo add-apt-repository -y ppa:cassou/emacs &&
11-
sudo apt-get -qq update &&
12-
sudo apt-get -qq -f install &&
13-
sudo apt-get -qq install emacs24 emacs24-el;
14-
fi
15-
- if [ "$EMACS" = 'emacs-snapshot' ]; then
16-
sudo add-apt-repository -y ppa:ubuntu-elisp/ppa &&
17-
sudo apt-get -qq update &&
18-
sudo apt-get -qq -f install &&
19-
sudo apt-get -qq install emacs-snapshot &&
20-
sudo apt-get -qq install emacs-snapshot-el;
21-
fi
22-
12+
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > travis.sh && source ./travis.sh
13+
- evm install $EVM_EMACS --use --skip
2314
script:
2415
- ./run_rust_emacs_tests.sh
2516

run_rust_emacs_tests_docker.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/sh
2+
3+
echo "Testing Local files with Emacs 26 (latest)"
4+
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
5+
6+
echo Testing Local files with Emacs 25
7+
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
8+
9+
echo "Testing Local files with Emacs 24 (oldest)"
10+
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
11+
12+
echo "Testing commits with Emacs 26 (latest)"
13+
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
14+
15+
echo Testing commits with Emacs 25
16+
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
17+
18+
echo "Testing commits with Emacs 24 (oldest)"
19+
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
20+
21+

test-by-cp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
cd ..
4+
mkdir copy
5+
cd copy
6+
cp -rf ../app/* .
7+
./run_rust_emacs_tests.sh

test-from-git

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
cd ..
4+
mkdir git
5+
cd git
6+
git clone ../app .
7+
./run_rust_emacs_tests.sh

0 commit comments

Comments
 (0)