Skip to content

Commit e8895ba

Browse files
committed
Update GitHub workflow to run on Ubuntu latest
* Update GitHub workflow to run on Ubuntu latest * Bump Erlang and Rebar3 versions * Update rebar3_lint plugin * Fix linter and dialyzer errors
1 parent 75c3a7a commit e8895ba

File tree

6 files changed

+25
-21
lines changed

6 files changed

+25
-21
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,44 @@ on:
1111
jobs:
1212
compile:
1313
name: Compile code
14-
runs-on: ubuntu-18.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
1717
- uses: erlef/setup-beam@v1
1818
with:
19-
otp-version: '23.3.4.18'
20-
rebar3-version: '3.16.1'
19+
otp-version: '25.3.2.21'
20+
rebar3-version: '3.24.0'
2121
- run: rebar3 compile
2222
test:
2323
name: Run Common Test tests
24-
runs-on: ubuntu-18.04
24+
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v2
2727
- uses: erlef/setup-beam@v1
2828
with:
2929
version-type: 'strict'
30-
otp-version: '23.3.4.18'
31-
rebar3-version: '3.16.1'
30+
otp-version: '25.3.2.21'
31+
rebar3-version: '3.24.0'
3232
- run: rebar3 ct
3333
dialyzer:
3434
name: Run Dialyzer
35-
runs-on: ubuntu-18.04
35+
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/checkout@v2
3838
- uses: erlef/setup-beam@v1
3939
with:
4040
version-type: 'strict'
41-
otp-version: '23.3.4.18'
42-
rebar3-version: '3.16.1'
41+
otp-version: '25.3.2.21'
42+
rebar3-version: '3.24.0'
4343
- run: rebar3 dialyzer
4444
lint:
4545
name: Run elvis linting
46-
runs-on: ubuntu-18.04
46+
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v2
4949
- uses: erlef/setup-beam@v1
5050
with:
5151
version-type: 'strict'
52-
otp-version: '23.3.4.18'
53-
rebar3-version: '3.16.1'
52+
otp-version: '25.3.2.21'
53+
rebar3-version: '3.24.0'
5454
- run: rebar3 lint

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
erlang 23.2.4
2-
rebar 3.16.1
1+
erlang 25.3.2.21
2+
rebar 3.24.0

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{erl_opts, [debug_info]}.
22
{project_plugins, [
3-
{rebar3_lint, "2.0.0"},
3+
{rebar3_lint, "3.2.6"},
44
{rebar3_hex, "7.0.2"}
55
]}.
66
{deps, [

src/eflambe.erl

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

2323
-type capture_return() :: {ok, [any()]} | {error, already_mecked}.
2424

25+
-export_type([mfa_fun/0, options/0, capture_return/0]).
26+
2527
-define(DEFAULT_OPTIONS, [{output_format, brendan_gregg}]).
2628
-define(DEFAULT_APPLY_OPTIONS, [{return, value}|?DEFAULT_OPTIONS]).
2729
-define(DEFAULT_CAPTURE_OPTIONS, [{return, filename}|?DEFAULT_OPTIONS]).

src/eflambe_server.erl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
timestamp, set_on_spawn]).
2525

2626
-record(state, {
27-
callback :: {pid(), reference()},
27+
callback :: {pid(), gen_server:reply_tag()},
2828
module :: atom(),
2929
max_calls :: integer(),
3030
calls = 0 :: integer(),
@@ -44,12 +44,13 @@
4444
tracer_pid :: pid()
4545
}).
4646

47-
-type state() :: #state{}.
48-
-type pid_trace() :: #pid_trace{}.
47+
-opaque state() :: #state{}.
48+
-opaque pid_trace() :: #pid_trace{}.
4949
-type from() :: {pid(), Tag :: term()}.
50-
5150
-type tracer_options() :: [eflambe:option() | {pid, pid()} | {max_calls, pos_integer()}].
5251

52+
-export_type([state/0, pid_trace/0, from/0, tracer_options/0]).
53+
5354
%%%===================================================================
5455
%%% API
5556
%%%===================================================================

src/eflambe_tracer.erl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535
return :: atom()
3636
}).
3737

38-
-type state() :: #state{}.
38+
-opaque state() :: #state{}.
3939
-type from() :: {pid(), Tag :: term()}.
40-
4140
-type tracer_options() :: [eflambe:option() | {pid, pid()}].
4241

42+
-export_type([state/0, from/0, tracer_options/0]).
43+
4344
%%%===================================================================
4445
%%% API
4546
%%%===================================================================

0 commit comments

Comments
 (0)