Merge pull request #7188 from thalesmg/bugfix-exclude-gpb-from-build
fix(mix): do not include gpb in the release
This commit is contained in:
commit
18abf7bd1e
9
build
9
build
|
@ -85,17 +85,22 @@ make_doc() {
|
||||||
halt(0)."
|
halt(0)."
|
||||||
}
|
}
|
||||||
|
|
||||||
make_rel() {
|
assert_no_compile_time_only_deps() {
|
||||||
./rebar3 as "$PROFILE" tar
|
|
||||||
if [ "$("$FIND" "_build/$PROFILE/rel/emqx/lib/" -maxdepth 1 -name 'gpb-*' -type d)" != "" ]; then
|
if [ "$("$FIND" "_build/$PROFILE/rel/emqx/lib/" -maxdepth 1 -name 'gpb-*' -type d)" != "" ]; then
|
||||||
echo "gpb should not be included in the release"
|
echo "gpb should not be included in the release"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
make_rel() {
|
||||||
|
./rebar3 as "$PROFILE" tar
|
||||||
|
assert_no_compile_time_only_deps
|
||||||
|
}
|
||||||
|
|
||||||
make_elixir_rel() {
|
make_elixir_rel() {
|
||||||
export_release_vars "$PROFILE"
|
export_release_vars "$PROFILE"
|
||||||
mix release --overwrite
|
mix release --overwrite
|
||||||
|
assert_no_compile_time_only_deps
|
||||||
}
|
}
|
||||||
|
|
||||||
## extract previous version .tar.gz files to _build/$PROFILE/rel/emqx before making relup
|
## extract previous version .tar.gz files to _build/$PROFILE/rel/emqx before making relup
|
||||||
|
|
2
mix.exs
2
mix.exs
|
@ -90,7 +90,7 @@ defmodule EMQXUmbrella.MixProject do
|
||||||
{:ranch,
|
{:ranch,
|
||||||
github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true},
|
github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true},
|
||||||
# in conflict by grpc and eetcd
|
# in conflict by grpc and eetcd
|
||||||
{:gpb, "4.11.2", override: true}
|
{:gpb, "4.11.2", override: true, runtime: false}
|
||||||
] ++ umbrella_apps() ++ bcrypt_dep() ++ quicer_dep()
|
] ++ umbrella_apps() ++ bcrypt_dep() ++ quicer_dep()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue