Merge pull request #100 from emqx/otp-26-1-2-1

feat: add OTP 26.1.2-1 and Elixir 1.15.7
emqx · Nov 22, 2023 · b151b71 · b151b71
2 parents 9c0709e + 1b763be
commit b151b71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,10 +18,10 @@ RUN mkdir /tools
 ARG EMQTT_BENCH_REF
 
 COPY get-emqtt-bench.sh /get-emqtt-bench.sh
-RUN /get-emqtt-bench.sh "${EMQTT_BENCH_REF:-0.4.11}"
+RUN /get-emqtt-bench.sh "${EMQTT_BENCH_REF:-0.4.17}"
 
 ARG LUX_REF
-ENV LUX_REF=${LUX_REF:-lux-2.6}
+ENV LUX_REF=${LUX_REF:-lux-2.9.1}
 
 RUN git clone --depth=1 --branch=${LUX_REF} https://github.com/hawk/lux /tools/lux \
     && cd /tools/lux \

diff --git a/RELEASE.md b/RELEASE.md
@@ -4,8 +4,10 @@ OTP version from emqx/otp.git:
 
 + OTP-24.3.4.2-1
 + OTP-25.3.2-2
++ OTP-26.1.2-1
 
 Elixir version from elixir-lang/elixir.git:
 NOTE: Only one version is allowed.
 
 + Elixir-1.14.5
++ Elixir-1.15.7
diff --git a/get-emqtt-bench.sh b/get-emqtt-bench.sh
@@ -2,7 +2,7 @@
 
 set -xeuo pipefail
 
-VSN="${1:-0.4.11}"
+VSN="${1:-0.4.17}"
 
 if grep -q -i 'rhel' /etc/os-release; then
     DIST='el'

diff --git a/get-otp.sh b/get-otp.sh
@@ -64,6 +64,9 @@ erl -eval '{ok, Version} = file:read_file(filename:join([code:root_dir(), "relea
 #########################
 
 case "${OTP_VERSION}" in
+    26*)
+        REBAR3_VERSION="${REBAR3_VERSION:-3.20.0-emqx-1}"
+        ;;
     25*)
         REBAR3_VERSION="${REBAR3_VERSION:-3.19.0-emqx-9}"
         ;;