From 68d91e770be06c294b1ff1075fbf94708ef7285a Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Fri, 15 Oct 2021 14:14:39 +0200 Subject: [PATCH 1/2] test: remove ct_helpers from apps/emqx rebar.config --- apps/emqx/rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 5020d4a98..c2651237a 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -29,8 +29,8 @@ {test, [{deps, [ meck + , proper , {bbmustache,"1.10.0"} - , {emqx_ct_helpers, {git,"https://github.com/emqx/emqx-ct-helpers.git", {tag,"2.1.0"}}} , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.4.3"}}} ]}, {extra_src_dirs, [{"test",[recursive]}]} From 71a11834adfc89a628e882f1fc2d9072059b7fb2 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Fri, 15 Oct 2021 16:46:49 +0200 Subject: [PATCH 2/2] chore: pin rebar plugins and test deps --- apps/emqx/rebar.config | 6 +++--- rebar.config.erl | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index c2651237a..b851700b9 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -23,13 +23,13 @@ , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.14.1"}}} ]}. -{plugins, [rebar3_proper]}. +{plugins, [{rebar3_proper, "0.12.1"}]}. {extra_src_dirs, [{"etc", [recursive]}]}. {profiles, [ {test, [{deps, - [ meck - , proper + [ {meck, "0.9.2"} + , {proper, "1.4.0"} , {bbmustache,"1.10.0"} , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.4.3"}}} ]}, diff --git a/rebar.config.erl b/rebar.config.erl index 9bdc5a323..a3f32d0c4 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -114,21 +114,21 @@ plugins(HasElixir) -> %% emqx main project does not require port-compiler %% pin at root level for deterministic , {pc, {git, "https://github.com/emqx/port_compiler.git", {tag, "v1.11.1"}}} - | [ rebar_mix || HasElixir ] + | [ {rebar_mix, "0.5.1"} || HasElixir ] ] %% test plugins are concatenated to default profile plugins %% otherwise rebar3 test profile runs are super slow ++ test_plugins(). test_plugins() -> - [ rebar3_proper, - {coveralls, {git, "https://github.com/emqx/coveralls-erl", {branch, "fix-git-info"}}} + [ {rebar3_proper, "0.12.1"} + , {coveralls, {git, "https://github.com/emqx/coveralls-erl", {tag, "v2.2.0-emqx-1"}}} ]. test_deps() -> [ {bbmustache, "1.10.0"} - , meck - , proper + , {meck, "0.9.2"} + , {proper, "1.4.0"} ]. common_compile_opts() ->