yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: upgrade jq and rebar3 for otp 26

This commit is contained in:
Zaiming (Stone) Shi 2023-11-29 10:42:06 +01:00
parent 89cdfbca63
commit 0e8a674a11
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mix.exs
View File

@ -823,7 +823,7 @@ defmodule EMQXUmbrella.MixProject do
defp jq_dep() do defp jq_dep() do
if enable_jq?(), if enable_jq?(),
do: [{:jq, github: "emqx/jq", tag: "v0.3.11", override: true}], do: [{:jq, github: "emqx/jq", tag: "v0.3.12", override: true}],
else: [] else: []
end end

9
rebar.config.erl
View File

@ -16,7 +16,7 @@ do(Dir, CONFIG) ->
assert_otp() -> assert_otp() ->
Oldest = 24, Oldest = 24,
Latest = 25, Latest = 26,
OtpRelease = list_to_integer(erlang:system_info(otp_release)), OtpRelease = list_to_integer(erlang:system_info(otp_release)),
case OtpRelease < Oldest orelse OtpRelease > Latest of case OtpRelease < Oldest orelse OtpRelease > Latest of
true -> true ->
@ -42,7 +42,7 @@ quicer() ->
{quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.202"}}}. {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.202"}}}.
jq() -> jq() ->
{jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.11"}}}. {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.12"}}}.
deps(Config) -> deps(Config) ->
{deps, OldDeps} = lists:keyfind(deps, 1, Config), {deps, OldDeps} = lists:keyfind(deps, 1, Config),
@ -53,7 +53,10 @@ deps(Config) ->
lists:keystore(deps, 1, Config, {deps, OldDeps ++ MoreDeps}). lists:keystore(deps, 1, Config, {deps, OldDeps ++ MoreDeps}).
overrides() -> overrides() ->
[{add, [{extra_src_dirs, [{"etc", [{recursive, true}]}]}]}] ++ snabbkaffe_overrides(). [
{add, [{extra_src_dirs, [{"etc", [{recursive, true}]}]}]},
{add, jesse, [{erl_opts, [nowarn_match_float_zero]}]}
] ++ snabbkaffe_overrides().
%% Temporary workaround for a rebar3 erl_opts duplication %% Temporary workaround for a rebar3 erl_opts duplication
%% bug. Ideally, we want to set this define globally %% bug. Ideally, we want to set this define globally