From 9d1f2c802f4886a2b59a68beeba21ddea47de11c Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Thu, 8 Sep 2022 16:53:22 +0800 Subject: [PATCH 1/4] chore: bump minirest to 0.3.9 to fix bind output --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index b23526949..19d199a6e 100644 --- a/rebar.config +++ b/rebar.config @@ -50,7 +50,7 @@ , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.1.11"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.2"}}} , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.3.6"}}} - , {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.7"}}} + , {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.9"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}} , {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.4"}}} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {branch, "2.0.4"}}} From cecedaccba899d1c08b3c43790a4402008085bc6 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 9 Sep 2022 17:01:50 +0200 Subject: [PATCH 2/4] docs: remove stale changlog --- CHANGES-4.3.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index 8ed7a470a..9cfc538e5 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -26,7 +26,6 @@ File format: - Improve error message for LwM2M plugin when object ID is not valid. [#8654](https://github.com/emqx/emqx/pull/8654). - Add tzdata apk package to alpine docker image. [#8671](https://github.com/emqx/emqx/pull/8671) -- Add node evacuation and cluster rebalancing features. [#8597](https://github.com/emqx/emqx/pull/8597) - Refine Rule Engine error log. RuleId will be logged when take action failed. [#8737](https://github.com/emqx/emqx/pull/8737) - Increases the latency interval for MQTT Bridge test connections to improve compatibility in high-latency environments. [#8745](https://github.com/emqx/emqx/pull/8745) - Close ExProto client process immediately if it's keepalive timeouted. [#8725](https://github.com/emqx/emqx/pull/8725) From 9e122f38b9c8bd60ede4d41b1adda59b5adf3a2d Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 9 Sep 2022 12:39:53 -0300 Subject: [PATCH 3/4] ci(fix): fix check for appup coverage Before: ```elixir iex(14)> :re.run('4.3.10', "4\\.3\\.[0-4]", [{:capture, :first, :list}]) {:match, ['4.3.1']} ``` --- scripts/update_appup.escript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index 141fd5833..9282aa902 100755 --- a/scripts/update_appup.escript +++ b/scripts/update_appup.escript @@ -374,12 +374,12 @@ ensure_version(Version, OldInstructions) -> contains_version(Needle, Haystack) when is_list(Needle) -> lists:any( - fun(<<"*">>) -> true; %% TODO: delete after we pass esockd 5.8.4 - (Regex) when is_binary(Regex) -> + fun(Regex) when is_binary(Regex) -> + Length = length(Needle), case re:run(Needle, Regex) of - {match, _} -> + {match, [{0, Length}]} -> true; - nomatch -> + _ -> false end; (Vsn) -> From 94afb633f8715ae153a0606da2f5ba8dce939694 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 9 Sep 2022 13:37:00 -0300 Subject: [PATCH 4/4] chore: update missing appup instructions --- apps/emqx_exproto/src/emqx_exproto.appup.src | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emqx_exproto/src/emqx_exproto.appup.src b/apps/emqx_exproto/src/emqx_exproto.appup.src index 20939ae63..fcf2fe6db 100644 --- a/apps/emqx_exproto/src/emqx_exproto.appup.src +++ b/apps/emqx_exproto/src/emqx_exproto.appup.src @@ -1,7 +1,8 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.3.9", + [{"4.3.10",[{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, + {"4.3.9", [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_gcli,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[2-8]">>, @@ -14,7 +15,8 @@ {load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.3.9", + [{"4.3.10",[{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, + {"4.3.9", [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_gcli,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[2-8]">>,