summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Rascão <luis.rascao@gmail.com>2018-02-01 09:34:04 +0000
committerGitHub <noreply@github.com>2018-02-01 09:34:04 +0000
commitb6d309417c502ca243f810e5313bea36951ef038 (patch)
tree2ad0f58f9a1caae93fc303fa9ef525feb1da0e2b
parent4bd43fefecdb6241bcb21b1b42428c8c4abc5e40 (diff)
parent8a2aca081780338330cd2145ab6cb86acde7c783 (diff)
downloadrebar-master.tar.gz
Merge pull request #620 from tuncer/travis-dialyzeHEADmaster
Travis dialyze
-rw-r--r--.travis.yml22
-rw-r--r--Makefile12
-rw-r--r--src/rebar_cover_utils.erl2
-rw-r--r--src/rebar_utils.erl2
-rw-r--r--src/rebar_xref.erl2
5 files changed, 32 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index dcb6606..8be6814 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,27 @@ otp_release:
- 17.0
- 18.0
- 19.1
- - 20.0.4
+ - 20.0.5
+ - 20.1.5
+env: MAKE_TARGET=ci
before_script:
- hostname -f
- cc -v
- ld -v
-script: "make travis"
+ - find .rebar
+after_script:
+ - find .rebar
+matrix:
+ include:
+ - otp_release: 20.1.5
+ env: MAKE_TARGET=ci-dialyze
+ allow_failures:
+ - otp_release: 20.1.5
+ env: MAKE_TARGET=ci-dialyze
+script: make $MAKE_TARGET
+cache:
+ directories:
+ - .rebar
+before_cache:
+ - rm -fv .rebar/erlcinfo
+ - rm -fv $HOME/.cache/.rebar/erlcinfo
diff --git a/Makefile b/Makefile
index d0d16f8..106e289 100644
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ check: debug xref dialyzer deps test
xref:
@./rebar xref
-build_plt:
- @./rebar build-plt
+maybe_build_plt:
+ @./rebar -vv check-plt || ./rebar -vv build-plt
-dialyzer:
- @./rebar dialyze
+dialyze: maybe_build_plt
+ @./rebar -vv dialyze
binary: VSN = $(shell ./rebar -V)
binary: clean all
@@ -45,4 +45,6 @@ test_eunit: all
test_inttest: all deps
@$(RETEST) -l $(LOG_LEVEL) $(RT_TARGETS)
-travis: clean debug xref clean all deps test
+ci: clean debug xref clean all deps test
+
+ci-dialyze: clean debug dialyze
diff --git a/src/rebar_cover_utils.erl b/src/rebar_cover_utils.erl
index 3fcba63..7b85f1c 100644
--- a/src/rebar_cover_utils.erl
+++ b/src/rebar_cover_utils.erl
@@ -35,6 +35,8 @@
-include("rebar.hrl").
+-dialyzer({no_opaque, has_header/2}).
+
%% ====================================================================
%% Internal functions
%% ====================================================================
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index a5cc0ff..6a62d34 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -296,7 +296,7 @@ vcs_vsn(Config, Vsn, Dir) ->
VsnString = vcs_vsn_1(Vsn, Dir),
Cache1 = dict:store(Key, VsnString, Cache),
Config1 = rebar_config:set_xconf(Config, vsn_cache, Cache1),
- save_vsn_cache(Config1),
+ _ = save_vsn_cache(Config1),
{Config1, VsnString};
{ok, VsnString} ->
{Config, VsnString}
diff --git a/src/rebar_xref.erl b/src/rebar_xref.erl
index ee3414d..ddfb029 100644
--- a/src/rebar_xref.erl
+++ b/src/rebar_xref.erl
@@ -40,6 +40,8 @@
%% for internal use only
-export([info/2]).
+-dialyzer({no_opaque, find_function_source/4}).
+
%% ===================================================================
%% Public API
%% ===================================================================