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

Merge pull request #12293 from thalesmg/dev-fix-dev-script-m-20240110 

ci: fix `dev` script support for elixir on OTP 26+
This commit is contained in:
Thales Macedo Garitezi 2024-01-11 09:21:47 -03:00 committed by GitHub
parent c026d3f18a 7cdaf78d1e
commit 3dd3f4803f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev
View File

@ -398,12 +398,22 @@ boot() {
else else
EPMD_ARGS_ELIXIR="-no_op true" EPMD_ARGS_ELIXIR="-no_op true"
fi fi
local OTP_VSN USER_MOD_ARG
OTP_VSN=$(./scripts/get-otp-vsn.sh)
case "$OTP_VSN" in
25*)
USER_MOD_ARG='-user Elixir.IEx.CLI'
;;
*)
USER_MOD_ARG='-user elixir'
;;
esac
# shellcheck disable=SC2086 # shellcheck disable=SC2086
env APPS="$APPS" iex \ env APPS="$APPS" iex \
-$ERL_NAME_ARG "$EMQX_NODE_NAME" \ -$ERL_NAME_ARG "$EMQX_NODE_NAME" \
--erl "$EPMD_ARGS_ELIXIR" \ --erl "$EPMD_ARGS_ELIXIR" \
--erl '-user Elixir.IEx.CLI' \ --erl "$USER_MOD_ARG" \
--erl '-proto_dist ekka' \ --erl '-proto_dist ekka' \
--vm-args "$ARGS_FILE" \ --vm-args "$ARGS_FILE" \
--erl-config "$CONF_FILE" \ --erl-config "$CONF_FILE" \