aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2013-09-18 22:09:27 -0500
committerTristan Sloughter <[email protected]>2013-09-19 20:26:25 -0500
commit61e6d8bb02149a244d2a3353a78c4543645717ac (patch)
treecb2b995863060fcef579b7eaea590c1ebec91163
parentc0a18117ddaff70e93411df060e1d7c7d1ad1b92 (diff)
downloadrelx-61e6d8bb02149a244d2a3353a78c4543645717ac.tar.gz
relx-61e6d8bb02149a244d2a3353a78c4543645717ac.tar.bz2
relx-61e6d8bb02149a244d2a3353a78c4543645717ac.zip
add rb16b01 and 02 and don't run dialyzer for r15 and below
-rw-r--r--.travis.yml2
-rw-r--r--Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index adf0a04..9b12a1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
language: erlang
otp_release:
+ - R16B02
+ - R16B01
- R16B
- R15B03
- R15B02
diff --git a/Makefile b/Makefile
index bfbaab8..39d0bb0 100644
--- a/Makefile
+++ b/Makefile
@@ -45,12 +45,12 @@ endif
# problem that travis times out. The code below lets us not run
# dialyzer on R14
OTP_VSN=$(shell erl -noshell -eval 'io:format("~p", [erlang:system_info(otp_release)]), erlang:halt(0).' | perl -lne 'print for /R(\d+).*/g')
-TRAVIS_SLOW=$(shell expr $(OTP_VSN) \<= 14 )
+TRAVIS_SLOW=$(shell expr $(OTP_VSN) \<= 15 )
ifeq ($(TRAVIS_SLOW), 0)
DIALYZER=$(shell which dialyzer)
else
-DIALYZER=: not running dialyzer on R14
+DIALYZER=: not running dialyzer on R14 or R15
endif
.PHONY: all compile doc clean test dialyzer typer shell distclean pdf \