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

ci: unset compile time vsn in dev profiles 

Before this commit source had been compiling with inconsistent
`erl_opts` under test profile with `PROFILE` env set to `emqx`.

```
{compile_info,[{emqx_vsn,"5.0.0-beta.5-g948d4170"}]},
{d,'EMQX_RELEASE_EDITION',ce},
```

Instead stop passing `emqx_vsn` through compile options as is
expected by `emqx_release:version/0`.
This commit is contained in:
Andrew Mayorov 2022-12-14 16:55:29 +03:00
parent 41a4e41d0c
commit aece9fb96f
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rebar.config.erl
View File

@ -119,7 +119,7 @@ is_win32() ->
win32 =:= element(1, os:type()). win32 =:= element(1, os:type()).
project_app_dirs() -> project_app_dirs() ->
project_app_dirs(get_edition_from_profille_env()). project_app_dirs(get_edition_from_profile_env()).
project_app_dirs(Edition) -> project_app_dirs(Edition) ->
["apps/*"] ++ ["apps/*"] ++
@ -154,14 +154,14 @@ test_deps() ->
{erl_csv, "0.2.0"} {erl_csv, "0.2.0"}
]. ].
common_compile_opts(Vsn) -> common_compile_opts() ->
common_compile_opts(get_edition_from_profille_env(), Vsn). common_compile_opts(get_edition_from_profile_env(), undefined).
common_compile_opts(Edition, Vsn) -> common_compile_opts(Edition, Vsn) ->
% always include debug_info % always include debug_info
[ [
debug_info, debug_info,
{compile_info, [{emqx_vsn, Vsn}]}, {compile_info, [{emqx_vsn, Vsn} || Vsn /= undefined]},
{d, 'EMQX_RELEASE_EDITION', Edition} {d, 'EMQX_RELEASE_EDITION', Edition}
] ++ ] ++
[{d, 'EMQX_BENCHMARK'} || os:getenv("EMQX_BENCHMARK") =:= "1"] ++ [{d, 'EMQX_BENCHMARK'} || os:getenv("EMQX_BENCHMARK") =:= "1"] ++
@ -180,7 +180,7 @@ warn_profile_env() ->
end. end.
%% this function is only used for test/check profiles %% this function is only used for test/check profiles
get_edition_from_profille_env() -> get_edition_from_profile_env() ->
case os:getenv("PROFILE") of case os:getenv("PROFILE") of
"emqx-enterprise" ++ _ -> "emqx-enterprise" ++ _ ->
ee; ee;
@ -243,15 +243,14 @@ profiles_ee() ->
%% EE has more files than CE, always test/check with EE options. %% EE has more files than CE, always test/check with EE options.
profiles_dev() -> profiles_dev() ->
Vsn = get_vsn('emqx-enterprise'),
[ [
{check, [ {check, [
{erl_opts, common_compile_opts(Vsn)}, {erl_opts, common_compile_opts()},
{project_app_dirs, project_app_dirs()} {project_app_dirs, project_app_dirs()}
]}, ]},
{test, [ {test, [
{deps, test_deps()}, {deps, test_deps()},
{erl_opts, common_compile_opts(Vsn) ++ erl_opts_i()}, {erl_opts, common_compile_opts() ++ erl_opts_i()},
{extra_src_dirs, [{"test", [{recursive, true}]}]}, {extra_src_dirs, [{"test", [{recursive, true}]}]},
{project_app_dirs, project_app_dirs()} {project_app_dirs, project_app_dirs()}
]} ]}