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

fix(ft-s3): fix release settings

This commit is contained in:
Ilya Averyanov 2023-04-04 12:53:58 +03:00
parent 3ffa01e160
commit 07ae50a54b
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_ft/src/emqx_ft.app.src
View File

@ -6,7 +6,8 @@
{applications, [ {applications, [
kernel, kernel,
stdlib, stdlib,
gproc gproc,
emqx_s3
]}, ]},
{env, []}, {env, []},
{modules, []} {modules, []}

13
apps/emqx_machine/src/emqx_machine_boot.erl
View File

@ -146,12 +146,17 @@ basic_reboot_apps() ->
emqx_authz, emqx_authz,
emqx_slow_subs, emqx_slow_subs,
emqx_auto_subscribe, emqx_auto_subscribe,
emqx_plugins, emqx_plugins
emqx_s3
], ],
case emqx_release:edition() of case emqx_release:edition() of
ce -> CE; ce ->
ee -> CE ++ [] CE;
ee ->
CE ++
[
emqx_s3,
emqx_ft
]
end. end.
sorted_reboot_apps() -> sorted_reboot_apps() ->

5
mix.exs
View File

@ -293,7 +293,6 @@ defmodule EMQXUmbrella.MixProject do
emqx_psk: :permanent, emqx_psk: :permanent,
emqx_slow_subs: :permanent, emqx_slow_subs: :permanent,
emqx_plugins: :permanent, emqx_plugins: :permanent,
emqx_ft: :permanent,
emqx_mix: :none emqx_mix: :none
] ++ ] ++
if(enable_quicer?(), do: [quicer: :permanent], else: []) ++ if(enable_quicer?(), do: [quicer: :permanent], else: []) ++
@ -308,7 +307,9 @@ defmodule EMQXUmbrella.MixProject do
emqx_license: :permanent, emqx_license: :permanent,
emqx_ee_conf: :load, emqx_ee_conf: :load,
emqx_ee_connector: :permanent, emqx_ee_connector: :permanent,
emqx_ee_bridge: :permanent emqx_ee_bridge: :permanent,
emqx_s3: :permanent,
emqx_ft: :permanent
], ],
else: [] else: []
) )

8
rebar.config.erl
View File

@ -400,9 +400,7 @@ relx_apps(ReleaseType, Edition) ->
emqx_prometheus, emqx_prometheus,
emqx_psk, emqx_psk,
emqx_slow_subs, emqx_slow_subs,
emqx_plugins, emqx_plugins
emqx_ft,
emqx_s3
] ++ ] ++
[quicer || is_quicer_supported()] ++ [quicer || is_quicer_supported()] ++
[bcrypt || provide_bcrypt_release(ReleaseType)] ++ [bcrypt || provide_bcrypt_release(ReleaseType)] ++
@ -424,7 +422,9 @@ relx_apps_per_edition(ee) ->
emqx_license, emqx_license,
{emqx_ee_conf, load}, {emqx_ee_conf, load},
emqx_ee_connector, emqx_ee_connector,
emqx_ee_bridge emqx_ee_bridge,
emqx_s3,
emqx_ft
]; ];
relx_apps_per_edition(ce) -> relx_apps_per_edition(ce) ->
[]. [].