Skip to content
Closed
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ jobs:
- '^cowboy \|^cowlib \|^gun \|^ranch '
- '^amqp_client \|^amqp10_client \|^aten \|^credentials_obfuscation \|^cuttlefish '
- '^gen_batch_server \|^ra \|^seshat \|^stdout_formatter \|^sysmon_handler '
- '^rocksdb '
extra: ['', 'LEGACY=1']
runs-on: ${{ matrix.os }}
steps:
Expand Down
21 changes: 20 additions & 1 deletion core/deps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -531,10 +531,11 @@ define dep_autopatch_rebar.erl
Write(io_lib:format("COMPILE_FIRST +=~s\n", [Names]))
end
end(),
Write("\n\nrebar_dep: preprocess pre-deps deps pre-app app\n"),
Write("\n\nrebar_dep: preprocess pre-deps deps pre-app app post-app\n"),
Write("\npreprocess::\n"),
Write("\npre-deps::\n"),
Write("\npre-app::\n"),
Write("\npost-app::\n"),
PatchHook = fun(Cmd) ->
Cmd2 = re:replace(Cmd, "^([g]?make)(.*)( -C.*)", "\\\\1\\\\3\\\\2", [{return, list}]),
case Cmd2 of
Expand Down Expand Up @@ -565,6 +566,24 @@ define dep_autopatch_rebar.erl
end || H <- Hooks]
end
end(),
fun() ->
case lists:keyfind(post_hooks, 1, Conf) of
false -> ok;
{_, Hooks} ->
[case H of
{compile, Cmd} ->
Write("\npost-app::\n\tCC=$$\(CC) " ++ PatchHook(Cmd) ++ "\n");
{{pc, compile}, Cmd} ->
Write("\npost-app::\n\tCC=$$\(CC) " ++ PatchHook(Cmd) ++ "\n");
{Regex, compile, Cmd} ->
case rebar_utils:is_arch(Regex) of
true -> Write("\npost-app::\n\tCC=$$\(CC) " ++ PatchHook(Cmd) ++ "\n");
false -> ok
end;
_ -> ok
end || H <- Hooks]
end
end(),
ShellToMk = fun(V0) ->
V1 = re:replace(V0, "[$$][(]", "$$\(shell ", [global]),
V = re:replace(V1, "([$$])(?![(])(\\\\w*)", "\\\\1(\\\\2)", [global]),
Expand Down
2 changes: 1 addition & 1 deletion test/hexpm_packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,7 @@ rlamb_publishtest 0.1.0
rlp 1.1.0
rmpc 18.5.9
robots 1.1.2
rocksdb 1.8.0
rocksdb 1.9.0
rocksdb_cloud 1.0.1
roni 1.0.1
roster 3.4.0
Expand Down
Loading