From 2bd75f7e113e662f5fee6b797b47804fc2c84ec8 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 26 May 2023 17:52:26 +0800 Subject: [PATCH] build: rm app `emqx_telemetry` in enterprise elixir release --- build | 2 +- mix.exs | 13 +++++++++++-- rebar.config.erl | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build b/build index cceaf3860..a5f63f403 100755 --- a/build +++ b/build @@ -146,7 +146,7 @@ assert_no_excluded_deps() { found="$($FIND "$rel_dir" -maxdepth 1 -type d -name "$app-*")" if [ -n "${found}" ]; then 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 fi done diff --git a/mix.exs b/mix.exs index bb73853a7..2023194d1 100644 --- a/mix.exs +++ b/mix.exs @@ -102,11 +102,11 @@ defmodule EMQXUmbrella.MixProject do end 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) end - defp umbrella_apps() do + defp umbrella_apps(profile_info) do enterprise_apps = enterprise_umbrella_apps() "apps/*" @@ -124,6 +124,15 @@ defmodule EMQXUmbrella.MixProject do |> elem(0) |> then(&MapSet.member?(enterprise_apps, &1)) end) + |> Enum.reject(fn {app, _} -> + case profile_info do + %{edition_type: :enterprise} -> + app == :emqx_telemetry + + _ -> + false + end + end) end defp enterprise_apps(_profile_info = %{edition_type: :enterprise}) do diff --git a/rebar.config.erl b/rebar.config.erl index 768423065..b61fef680 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -487,6 +487,7 @@ relx_apps_per_edition(ee) -> ]; relx_apps_per_edition(ce) -> [emqx_telemetry]. + relx_overlay(ReleaseType, Edition) -> [ {mkdir, "log/"},