Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:

strategy:
matrix:
otp_version: [23, 24, 26]
os: [ubuntu-20.04] # latest only runs >= 24.2
otp_version: [26, 27, 28]
os: [ubuntu-latest]

container:
image: erlang:${{ matrix.otp_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shelltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
# TODO: make a batch of tests that runs on nodetool rather
# than the new connectivity mechanism
otp_version: [25, 26]
otp_version: [26, 27, 28]
os: [ubuntu-latest] # latest only runs >= 24.2

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wintest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:

strategy:
matrix:
otp_version: [24, 25, 26]
os: [windows-latest]
otp_version: [26, 27, 28]
os: [windows-2022]

steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 11 additions & 1 deletion priv/templates/extended_bin
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,17 @@ if [ "$ERL_DIST_PORT" ]; then
else
ADDRESS="$ERL_DIST_PORT"
fi
if [ "11.1" = "$(printf "%s\n11.1" "${ERTS_VSN}" | sort -V | head -n1)" ] ; then

# if erts >= 15 then use the kernel application variable for port number
if [ "15.0" = "$(printf "%s\n15.0" "${ERTS_VSN}" | sort -V | head -n1)" ] ; then
# unless set by the user, set start_epmd to false when ERL_DIST_PORT is used
if [ ! "$START_EPMD" ]; then
EXTRA_DIST_ARGS="-kernel erl_epmd_node_listen_port ${ERL_DIST_PORT} -start_epmd false"
else
EXTRA_DIST_ARGS="-kernel erl_epmd_node_listen_port ${ERL_DIST_PORT}"
fi
# if erts >= 11.1 then use the kernel application variable for port number
elif [ "11.1" = "$(printf "%s\n11.1" "${ERTS_VSN}" | sort -V | head -n1)" ] ; then
# unless set by the user, set start_epmd to false when ERL_DIST_PORT is used
if [ ! "$START_EPMD" ]; then
EXTRA_DIST_ARGS="-erl_epmd_port ${ERL_DIST_PORT} -start_epmd false"
Expand Down
11 changes: 1 addition & 10 deletions shelltests/check_undefined_test/check_undefined_test.test
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
$ TERM=dumb rebar3 release
>
===> Verifying dependencies...
===> Analyzing applications...
===> Compiling check_undefined_test
===> Assembling release check_undefined_test-0.1.0...
===> There are missing function calls in the release.
===> Make sure all applications needed at runtime are included in the release.
===> check_undefined_test_app:start/2 calls undefined function crypto:start/0
===> check_undefined_test_app:start/2 calls undefined function notamodule:dosomething/0
===> Release successfully assembled: _build/default/rel/check_undefined_test
> /calls undefined function notamodule/
>= 0
2 changes: 1 addition & 1 deletion src/relx.erl
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ build_tar(RelName, Apps, State) when is_atom(RelName) ->
{ok, RealizedRelease}.

-spec build_relup(rlx_release:name(), rlx_release:vsn(), rlx_release:vsn(), rlx_config:t() | rlx_state:t())
-> {ok, rlx_state:t()} | {error, term()}.
-> {ok, rlx_state:t()}.
build_relup(RelName, ToVsn, UpFromVsn, Config) when is_list(Config) ->
{ok, State} = rlx_config:to_state(Config),
build_relup(RelName, ToVsn, UpFromVsn, State);
Expand Down
6 changes: 3 additions & 3 deletions src/rlx_relup.erl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
-include("relx.hrl").
-include("rlx_log.hrl").

-spec do(atom(), string(), string() | undefined, rlx_state:t()) -> {ok, rlx_state:t()} | relx:error().
-spec do(atom(), string(), string() | undefined, rlx_state:t()) -> {ok, rlx_state:t()}.
do(RelName, ToVsn, undefined, State) ->
OutputDir = rlx_state:base_output_dir(State),
ReleasesDir = filename:join([OutputDir, RelName, "releases"]),
Expand Down Expand Up @@ -40,14 +40,14 @@ make_upfrom_script(Name, ToVsn, UpFromVsn, State) ->
WarningsAsErrors = rlx_state:warnings_as_errors(State),
Options = [{outdir, OutDir},
{path, [filename:join([OutputDir, "*", "lib", "*", "ebin"])]},
{silent, true} | case WarningsAsErrors of
silent | case WarningsAsErrors of
true -> [warnings_as_errors];
false -> []
end],
CurrentRel = strip_dot_rel(find_rel_file(Name, ToVsn, OutputDir)),
UpFromRel = strip_dot_rel(find_rel_file(Name, UpFromVsn, OutputDir)),
?log_debug("systools:make_relup(~p, ~p, ~p, ~p)", [CurrentRel, UpFromRel, UpFromRel, Options]),
case systools:make_relup(CurrentRel, [UpFromRel], [UpFromRel], [no_warn_sasl | Options]) of
case systools:make_relup(CurrentRel, [UpFromRel], [UpFromRel], Options) of
ok ->
?log_info("relup from ~s to ~s successfully created!", [UpFromRel, CurrentRel]),
{ok, State};
Expand Down
Loading