Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ARG OTP_VERSION=28.1
ARG ELIXIR_VERSION=1.18.4
ARG RUST_VERSION=1.88.0
ARG FDB_VERSION=7.3.43
ARG EMQTT_BENCH_VERSION=0.5.3
ARG LUX_VERSION=lux-3.0

COPY get-otp.sh get-zsh.sh get-elixir.sh get-fdb.sh get-rust.sh get-emqtt-bench.sh get-lux.sh /
Expand All @@ -24,7 +23,7 @@ RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/en
/get-elixir.sh ${ELIXIR_VERSION} && \
if [ "${OTP_VERSION#26.}" != "$OTP_VERSION" ]; then /get-fdb.sh ${FDB_VERSION}; fi && \
if echo "${OTP_VERSION}" | grep -q "^27\."; then /get-rust.sh ${RUST_VERSION}; fi && \
/get-emqtt-bench.sh ${EMQTT_BENCH_VERSION} && \
/get-emqtt-bench.sh && \
/get-lux.sh ${LUX_VERSION} && \
rm /get-otp.sh /get-zsh.sh /get-elixir.sh /get-fdb.sh /get-emqtt-bench.sh /get-lux.sh

Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ OTP version from emqx/otp.git, Elixir version from elixir-lang/elixir.git.

Uncomment older releases when there is an update.

# + OTP-24.3.4.2-4,Elixir-1.15.7
# + OTP-26.2.5.14-1,Elixir-1.15.7
+ OTP-24.3.4.2-4,Elixir-1.15.7
+ OTP-26.2.5.14-1,Elixir-1.15.7
+ OTP-27.3.4.2-4,Elixir-1.18.3
+ OTP-28.1,Elixir-1.18.4
25 changes: 23 additions & 2 deletions get-emqtt-bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

set -xeuo pipefail

VSN="${1:-0.5.3}"

. /etc/os-release
if [[ "${ID_LIKE:-}" =~ rhel|fedora ]]; then
DIST='el'
Expand Down Expand Up @@ -31,6 +29,29 @@ case "$SYSTEM" in
;;
esac

OTP_VERSION="$(erl -eval 'io:format("~s", [erlang:system_info(otp_release)]), halt().' -noshell)"

case "${OTP_VERSION}" in
28*)
VSN="${1:-0.5.5}"
;;
27*)
VSN="${1:-0.5.2}"
;;
26*)
VSN="${1:-0.5.0}"
;;
25*)
VSN="${1:-0.5.0}"
;;
24*)
VSN="${1:-0.4.17}"
;;
*)
echo "OTP_VERSION is invalid: ${OTP_VERSION}"
exit 1
esac

git clone --depth=1 --branch="${VSN}" https://github.com/emqx/emqtt-bench.git /emqtt-bench
make REBAR=/usr/local/bin/rebar3 -C /emqtt-bench
cp -v /emqtt-bench/_build/emqtt_bench/bin/* /usr/local/bin/
Expand Down