Просмотр исходного кода

fix(dsraft): switch to emqx/ra v2.14.0-emqx-1 with proposed bugfix

Andrew Mayorov 1 год назад
Родитель
Сommit
b3d4efdf54
4 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      apps/emqx_ds_builtin_raft/rebar.config
  2. 1 1
      apps/emqx_durable_storage/mix.exs
  3. 1 1
      mix.exs
  4. 1 1
      rebar.config

+ 1 - 1
apps/emqx_ds_builtin_raft/rebar.config

@@ -2,5 +2,5 @@
 
 {deps, [
     {emqx_durable_storage, {path, "../emqx_durable_storage"}},
-    {ra, "2.14.0"}
+    {ra, {git, "https://github.com/emqx/ra.git", {tag, "v2.14.0-emqx-1"}}}
 ]}.

+ 1 - 1
apps/emqx_durable_storage/mix.exs

@@ -37,7 +37,7 @@ defmodule EMQXDurableStorage.MixProject do
       {:emqx_utils, in_umbrella: true},
       UMP.common_dep(:rocksdb),
       UMP.common_dep(:gproc),
-      {:ra, "2.14.0"},
+      UMP.common_dep(:ra),
     ]
   end
 end

+ 1 - 1
mix.exs

@@ -208,7 +208,7 @@ defmodule EMQXUmbrella.MixProject do
   def common_dep(:telemetry), do: {:telemetry, "1.1.0", override: true}
   # in conflict by grpc and eetcd
   def common_dep(:gpb), do: {:gpb, "4.19.9", override: true, runtime: false}
-  def common_dep(:ra), do: {:ra, "2.14.0", override: true}
+  def common_dep(:ra), do: {:ra, github: "emqx/ra", tag: "v2.14.0-emqx-1", override: true}
 
   # in conflict by emqx_connector and system_monitor
   def common_dep(:epgsql), do: {:epgsql, github: "emqx/epgsql", tag: "4.7.1.2", override: true}

+ 1 - 1
rebar.config

@@ -111,7 +111,7 @@
     {ssl_verify_fun, "1.1.7"},
     {rfc3339, {git, "https://github.com/emqx/rfc3339.git", {tag, "0.2.3"}}},
     {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.2"}}},
-    {ra, "2.14.0"}
+    {ra, {git, "https://github.com/emqx/ra.git", {tag, "v2.14.0-emqx-1"}}}
 ]}.
 
 {xref_ignores,