Skip to content

Commit e9d8cea

Browse files
committed
Merge pull request #230 from elixir-lang/update-travis-setup
update travis setup
2 parents a2be4f9 + ef75eab commit e9d8cea

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
language: erlang
1+
language: elixir
2+
elixir: 1.0.5
23
otp_release:
3-
- 17.1
4+
- 18.0
5+
cache: apt
46
env:
5-
- EMACS=emacs24 EMACS_REPO=cassou/emacs TEST_RUN="rake test"
6-
- EMACS=emacs-snapshot EMACS_REPO=ubuntu-elisp/ppa TEST_RUN="rake test-no-gui"
7+
- EVM_EMACS=emacs-24.3-bin TEST_RUN="rake test"
8+
- EVM_EMACS=emacs-24.4-bin TEST_RUN="rake test"
9+
- EVM_EMACS=emacs-24.5-bin TEST_RUN="rake test-no-gui"
710
before_install:
8-
- sudo add-apt-repository -y ppa:$EMACS_REPO
9-
- sudo apt-get update
10-
- sudo apt-get -y install $EMACS
11-
- cd /tmp
12-
- wget https://github.com/elixir-lang/elixir/releases/download/v1.0.0/Precompiled.zip
13-
- unzip Precompiled.zip
14-
- export PATH="$PWD/bin:$PATH"
15-
- cd -
16-
- curl -fsSkL https://raw.github.com/cask/cask/master/go | python
17-
- export PATH="/home/travis/.cask/bin:$PATH"
11+
- curl -fsSkL https://gist.githubusercontent.com/tonini/09a8bec7a0b2c219e0d7/raw > travis.sh && source ./travis.sh
12+
- evm install $EVM_EMACS --use --skip
13+
- cask
14+
install:
15+
- cask install
1816
script:
1917
- $TEST_RUN

test/elixir-mode-font-test.el

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
;;; Code:
1010

11+
(require 'test-helper)
12+
1113
(defun elixir-test-face-at (pos &optional content)
1214
"Get the face at POS in CONTENT.
1315

test/elixir-mode-indentation-test.el

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
;;; Code:
1111

12+
(require 'test-helper)
13+
1214
(elixir-def-indentation-test indent-use-dot-module-newline
1315
(:tags '(indentation))
1416
"defmodule Foo do

0 commit comments

Comments
 (0)