diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 2eb7855d5..35cb7c1a6 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -40,11 +40,9 @@ jobs: - name: run eunit run: | 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 run: | 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 run: | docker exec -i erlang bash -c "make cover" diff --git a/rebar.config.erl b/rebar.config.erl index 7bcc030f7..f1ed9fda8 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -26,7 +26,7 @@ extra_deps() -> Filter = string:split(os:getenv("EMQX_EXTRA_PLUGINS", ""), ",", all), ErlPlugins = filter_extra_deps(ErlPlugins0, Filter), ExPlugins = filter_extra_deps(ExPlugins0, Filter), - {ExPlugins=/= [], ErlPlugins ++ ExPlugins}. + {ExPlugins =/= [], ErlPlugins ++ ExPlugins}. filter_extra_deps(AllPlugins, ["all"]) -> AllPlugins; @@ -34,10 +34,10 @@ filter_extra_deps(AllPlugins, Filter) -> filter_extra_deps(AllPlugins, Filter, []). filter_extra_deps([], _, 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 true -> - filter_extra_deps(More, Filter, [P|Acc]); + filter_extra_deps(More, Filter, [P | Acc]); false -> filter_extra_deps(More, Filter, Acc) end.