Skip to content

Commit dfb47c5

Browse files
committed
Support Erlang 27.0
Removes no-longer supported OTP version 24. Migrates from 'slave' to 'peer' in test code.
1 parent aa278c1 commit dfb47c5

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

.github/workflows/erlang.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,21 @@ on:
77

88
jobs:
99
ci:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
name: Erlang ${{matrix.otp}} / rebar ${{matrix.rebar3}}
1212
strategy:
1313
matrix:
14-
otp: ['24', '25', '26']
15-
rebar3: ['3']
14+
otp: ["25", "26", "27"]
15+
rebar3: ["3"]
1616
steps:
17-
18-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1918

2019
- uses: erlef/setup-beam@v1
2120
with:
2221
otp-version: ${{matrix.otp}}
2322
rebar3-version: ${{matrix.rebar3}}
2423

25-
- uses: actions/cache@v3
24+
- uses: actions/cache@v4
2625
env:
2726
cache-name: rebar3
2827
with:

rebar.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
{minimum_otp_vsn, "25.0"}.
2+
13
{profiles, [
24
{test, [
35
{deps, [unite]},

test/meck_tests.erl

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,31 +1348,28 @@ remote_meck_test_() ->
13481348

13491349
remote_setup() ->
13501350
[] = os:cmd("epmd -daemon"),
1351-
Hostname = case node() of
1352-
'nonode@nohost' -> "localhost";
1353-
_ -> test_server_sup:hoststr()
1354-
end,
1355-
Myself = list_to_atom("meck_eunit_test@" ++ Hostname),
1356-
net_kernel:start([Myself, shortnames]),
1357-
{ok, Node} = slave:start_link(list_to_atom(Hostname), meck_remote_test,
1358-
"-pa \"" ++ test_dir() ++ "\""),
1351+
net_kernel:start([meck_eunit_test]),
1352+
{ok, Pid, Node} = peer:start_link(#{
1353+
name => meck_remote_test,
1354+
args => ["-pa", test_dir()]
1355+
}),
13591356
{Mod, Bin, File} = code:get_object_code(meck),
13601357
true = rpc:call(Node, code, add_path, [filename:dirname(File)]),
13611358
{module, Mod} = rpc:call(Node, code, load_binary, [Mod, File, Bin]),
13621359
{module, meck_test_module} =
13631360
rpc:call(Node, code, load_file, [meck_test_module]),
1364-
{Node, meck_test_module}.
1361+
{Pid, Node, meck_test_module}.
13651362

1366-
remote_teardown({Node, _Mod}) ->
1367-
ok = slave:stop(Node),
1363+
remote_teardown({Pid, _Node, _Mod}) ->
1364+
ok = peer:stop(Pid),
13681365
ok = net_kernel:stop().
13691366

1370-
remote_meck_({Node, Mod}) ->
1367+
remote_meck_({_Pid, Node, Mod}) ->
13711368
?assertEqual(ok, rpc:call(Node, meck, new, [Mod, [no_link, non_strict]])),
13721369
?assertEqual(ok, rpc:call(Node, meck, expect, [Mod, test, 0, true])),
13731370
?assertEqual(true, rpc:call(Node, Mod, test, [])).
13741371

1375-
remote_meck_cover_({Node, Mod}) ->
1372+
remote_meck_cover_({_Pid, Node, Mod}) ->
13761373
{ok, Mod} = cover:compile(test_file(Mod, ".erl")),
13771374
{ok, _Nodes} = cover:start([Node]),
13781375
?assertEqual(ok, rpc:call(Node, meck, new, [Mod])).

0 commit comments

Comments
 (0)