diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index bcd88054a..7fd9eaa9b 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -189,7 +189,7 @@ jobs: # gsed -i '/emqx_telemetry/d' ./emqx/data/loaded_plugins ./emqx/bin/emqx start || cat emqx/log/erlang.log.1 ready='no' - for i in {1..10}; do + for i in {1..30}; do if curl -fs 127.0.0.1:18083/api/v5/status > /dev/null; then ready='yes' break diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 53aaeb0f1..4ade86dc6 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -27,12 +27,12 @@ {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}}, - {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.3"}}}, + {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.4"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.27.3"}}}, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}, {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}, - {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}} + {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.0"}}} ]}. {plugins, [{rebar3_proper, "0.12.1"}]}. diff --git a/mix.exs b/mix.exs index c29cdcc69..4684c15c0 100644 --- a/mix.exs +++ b/mix.exs @@ -54,8 +54,8 @@ defmodule EMQXUmbrella.MixProject do {:jiffy, github: "emqx/jiffy", tag: "1.0.5", override: true}, {:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true}, {:esockd, github: "emqx/esockd", tag: "5.9.1", override: true}, - {:mria, github: "emqx/mria", tag: "0.2.3", override: true}, - {:ekka, github: "emqx/ekka", tag: "0.12.3", override: true}, + {:mria, github: "emqx/mria", tag: "0.2.4", override: true}, + {:ekka, github: "emqx/ekka", tag: "0.12.4", override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true}, {:minirest, github: "emqx/minirest", tag: "1.2.12", override: true}, {:ecpool, github: "emqx/ecpool", tag: "0.5.2"}, @@ -67,7 +67,7 @@ defmodule EMQXUmbrella.MixProject do {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"}, # in conflict by emqtt and hocon {:getopt, "1.0.2", override: true}, - {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.18.0", override: true}, + {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.0", override: true}, {:hocon, github: "emqx/hocon", tag: "0.27.3", override: true}, {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.1", override: true}, {:esasl, github: "emqx/esasl", tag: "0.2.0"}, diff --git a/rebar.config b/rebar.config index d6e520064..5b08853dd 100644 --- a/rebar.config +++ b/rebar.config @@ -53,8 +53,8 @@ , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}} , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}} , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}} - , {mria, {git, "https://github.com/emqx/mria", {tag, "0.2.3"}}} - , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.3"}}} + , {mria, {git, "https://github.com/emqx/mria", {tag, "0.2.4"}}} + , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.4"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}} , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.2.12"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}} @@ -65,7 +65,7 @@ , {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}} , {getopt, "1.0.2"} - , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}} + , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.0"}}} , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.27.3"}}} , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.1"}}} , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}