chore(build): remove plugin regression for now

We do not have Elixir in build environment
This commit is contained in:
Zaiming Shi 2021-03-18 00:30:25 +01:00 committed by Zaiming (Stone) Shi
parent 73a8494760
commit ddec66fe35
2 changed files with 3 additions and 5 deletions

View File

@ -40,11 +40,9 @@ jobs:
- name: run eunit - name: run eunit
run: | run: |
docker exec -i erlang bash -c "make eunit" docker exec -i erlang bash -c "make eunit"
docker exec --env EMQX_EXTRA_PLUGINS=all -i erlang bash -c "./rebar3 eunit --dir $(find lib-extra/ -mindepth 1 -maxdepth 2 -type l | tr '\n' ',')"
- name: run common test - name: run common test
run: | run: |
docker exec -i erlang bash -c "make ct" docker exec -i erlang bash -c "make ct"
docker exec --env EMQX_EXTRA_PLUGINS=all -i erlang bash -c "./rebar3 ct --dir $(find lib-extra/ -mindepth 1 -maxdepth 2 -type l | tr '\n' ',')"
- name: run cover - name: run cover
run: | run: |
docker exec -i erlang bash -c "make cover" docker exec -i erlang bash -c "make cover"

View File

@ -26,7 +26,7 @@ extra_deps() ->
Filter = string:split(os:getenv("EMQX_EXTRA_PLUGINS", ""), ",", all), Filter = string:split(os:getenv("EMQX_EXTRA_PLUGINS", ""), ",", all),
ErlPlugins = filter_extra_deps(ErlPlugins0, Filter), ErlPlugins = filter_extra_deps(ErlPlugins0, Filter),
ExPlugins = filter_extra_deps(ExPlugins0, Filter), ExPlugins = filter_extra_deps(ExPlugins0, Filter),
{ExPlugins=/= [], ErlPlugins ++ ExPlugins}. {ExPlugins =/= [], ErlPlugins ++ ExPlugins}.
filter_extra_deps(AllPlugins, ["all"]) -> filter_extra_deps(AllPlugins, ["all"]) ->
AllPlugins; AllPlugins;
@ -34,10 +34,10 @@ filter_extra_deps(AllPlugins, Filter) ->
filter_extra_deps(AllPlugins, Filter, []). filter_extra_deps(AllPlugins, Filter, []).
filter_extra_deps([], _, Acc) -> filter_extra_deps([], _, Acc) ->
lists:reverse(Acc); lists:reverse(Acc);
filter_extra_deps([{Plugin, _}=P|More], Filter, Acc) -> filter_extra_deps([{Plugin, _} = P | More], Filter, Acc) ->
case lists:member(atom_to_list(Plugin), Filter) of case lists:member(atom_to_list(Plugin), Filter) of
true -> true ->
filter_extra_deps(More, Filter, [P|Acc]); filter_extra_deps(More, Filter, [P | Acc]);
false -> false ->
filter_extra_deps(More, Filter, Acc) filter_extra_deps(More, Filter, Acc)
end. end.