build: rm app `emqx_telemetry` in enterprise elixir release

This commit is contained in:
JimMoen 2023-05-26 17:52:26 +08:00
parent ee122155f1
commit 2bd75f7e11
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
3 changed files with 13 additions and 3 deletions

2
build
View File

@ -146,7 +146,7 @@ assert_no_excluded_deps() {
found="$($FIND "$rel_dir" -maxdepth 1 -type d -name "$app-*")" found="$($FIND "$rel_dir" -maxdepth 1 -type d -name "$app-*")"
if [ -n "${found}" ]; then if [ -n "${found}" ]; then
echo "ERROR: ${app} should not be included in ${PROFILE}" echo "ERROR: ${app} should not be included in ${PROFILE}"
echo "ERROR: found ${app}in ${rel_dir}" echo "ERROR: found ${app} in ${rel_dir}"
exit 1 exit 1
fi fi
done done

13
mix.exs
View File

@ -102,11 +102,11 @@ defmodule EMQXUmbrella.MixProject do
end end
defp emqx_apps(profile_info, version) do defp emqx_apps(profile_info, version) do
apps = umbrella_apps() ++ enterprise_apps(profile_info) apps = umbrella_apps(profile_info) ++ enterprise_apps(profile_info)
set_emqx_app_system_env(apps, profile_info, version) set_emqx_app_system_env(apps, profile_info, version)
end end
defp umbrella_apps() do defp umbrella_apps(profile_info) do
enterprise_apps = enterprise_umbrella_apps() enterprise_apps = enterprise_umbrella_apps()
"apps/*" "apps/*"
@ -124,6 +124,15 @@ defmodule EMQXUmbrella.MixProject do
|> elem(0) |> elem(0)
|> then(&MapSet.member?(enterprise_apps, &1)) |> then(&MapSet.member?(enterprise_apps, &1))
end) end)
|> Enum.reject(fn {app, _} ->
case profile_info do
%{edition_type: :enterprise} ->
app == :emqx_telemetry
_ ->
false
end
end)
end end
defp enterprise_apps(_profile_info = %{edition_type: :enterprise}) do defp enterprise_apps(_profile_info = %{edition_type: :enterprise}) do

View File

@ -487,6 +487,7 @@ relx_apps_per_edition(ee) ->
]; ];
relx_apps_per_edition(ce) -> relx_apps_per_edition(ce) ->
[emqx_telemetry]. [emqx_telemetry].
relx_overlay(ReleaseType, Edition) -> relx_overlay(ReleaseType, Edition) ->
[ [
{mkdir, "log/"}, {mkdir, "log/"},