Skip to content

Commit a9cda4c

Browse files
authored
Merge pull request #187 from esl/updates
Update dependencies and configs
2 parents d842d1f + 55c27e0 commit a9cda4c

File tree

3 files changed

+39
-21
lines changed

3 files changed

+39
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
otp_vsn: ['27', '26', '25']
16-
rebar_vsn: ['3.24.0']
16+
rebar_vsn: ['3.24']
1717
test-type: ['regular', 'integration']
1818
runs-on: 'ubuntu-24.04'
1919
steps:

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: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99

1010
{profiles, [
1111
{test, [
12-
{plugins, [{rebar3_codecov, "0.6.0"}]},
1312
{deps, [
14-
{meck, "0.9.2"},
13+
{meck, "1.0.0"},
1514
{proper, "1.4.0"},
1615
{bbmustache, "1.12.2"},
1716
{wait_helper, "0.2.1"}
1817
]}
19-
]},
20-
{elvis, [{plugins, [{rebar3_lint, "3.2.6"}]}]}
18+
]}
2119
]}.
2220

2321
{relx, [
@@ -43,8 +41,10 @@
4341
]}.
4442

4543
{project_plugins, [
46-
rebar3_hex,
47-
rebar3_ex_doc
44+
{rebar3_hex, "~> 7.0"},
45+
{rebar3_ex_doc, "~> 0.2"},
46+
{rebar3_lint, "~> 4.0"},
47+
{rebar3_codecov, "~> 0.7"}
4848
]}.
4949

5050
{ex_doc, [
@@ -66,4 +66,24 @@
6666
{main, <<"readme">>}
6767
]}.
6868

69-
{hex, [{doc, ex_doc}]}.
69+
{hex, [{doc, #{provider => ex_doc}}]}.
70+
71+
{elvis, [
72+
#{
73+
dirs => ["src/**"],
74+
filter => "*.erl",
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+
]
83+
},
84+
#{
85+
dirs => ["."],
86+
filter => "rebar.config",
87+
ruleset => rebar_config
88+
}
89+
]}.

0 commit comments

Comments
 (0)