Skip to content

Commit 55c27e0

Browse files
committed
Update elvis rules
1 parent d9dc94c commit 55c27e0

2 files changed

Lines changed: 19 additions & 14 deletions

File tree

Makefile

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
.PHONY: default rel deps compile clean ct lint dialyzer xref console
22
.PHONY: test integration_test rerun_integration_test
33

4-
REBAR = rebar3
5-
64
ifdef SUITE
75
SUITE_OPTS = --suite $$SUITE
86
endif
97

108
default: compile
119

1210
rel:
13-
$(REBAR) release
11+
rebar3 release
1412

1513
deps:
16-
$(REBAR) deps
17-
$(REBAR) compile --deps_only
14+
rebar3 deps
15+
rebar3 compile --deps_only
1816

1917
compile:
20-
$(REBAR) compile
18+
rebar3 compile
2119

2220
clean:
2321
rm -rf _build
@@ -29,16 +27,16 @@ ct:
2927
## make ct SUITE=some_test_SUITE,another_test_SUITE
3028
## SUITE=some_test_SUITE make ct
3129
## SUITE=some_test_SUITE,another_test_SUITE make ct
32-
@ echo $(REBAR) ct -c --verbose $(SUITE_OPTS)
33-
@ $(REBAR) ct -c --verbose $(SUITE_OPTS)
30+
@ echo rebar3 ct -c --verbose $(SUITE_OPTS)
31+
@ rebar3 ct -c --verbose $(SUITE_OPTS)
3432

3533
lint:
36-
$(REBAR) as elvis lint
34+
rebar3 lint
3735

3836
test: compile xref dialyzer ct lint codecov
3937

4038
codecov:
41-
$(REBAR) as test codecov analyze
39+
rebar3 as test codecov analyze
4240

4341
integration_test:
4442
./integration_test/stop_test_cluster.sh
@@ -58,12 +56,12 @@ rerun_integration_test:
5856
./integration_test/test_add_new_node.sh
5957

6058
dialyzer:
61-
$(REBAR) dialyzer
59+
rebar3 dialyzer
6260

6361
xref:
64-
$(REBAR) xref
62+
rebar3 xref
6563

6664
console:
6765
@echo "tests can be executed manually using ct:run/1 function:\n" \
6866
' ct:run("test").'
69-
$(REBAR) as test shell
67+
rebar3 as test shell

rebar.config

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,14 @@
7272
#{
7373
dirs => ["src/**"],
7474
filter => "*.erl",
75-
ruleset => erl_files
75+
ruleset => erl_files,
76+
rules => [
77+
{elvis_text_style, line_length, #{skip_comments => whole_line}},
78+
{elvis_style, export_used_types, disable},
79+
{elvis_style, invalid_dynamic_call, #{ignore => [{amoc_code_server, get_md5}]}},
80+
{elvis_style, no_block_expressions, #{ignore => [amoc_cluster]}},
81+
{elvis_style, no_throw, #{ignore => [amoc_config]}}
82+
]
7683
},
7784
#{
7885
dirs => ["."],

0 commit comments

Comments
 (0)