Skip to content

Commit 2160d3a

Browse files
authored
Merge pull request #140 from emqx/20251006-support-otp-28
feat: support OTP 28
2 parents 4475756 + 648b353 commit 2160d3a

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:22.04
1+
ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:24.04
22
FROM ${BUILD_FROM}
33

44
ENV EMQX_BUILDER_IMAGE=${BUILD_FROM}
55
ENV ERL_AFLAGS="-kernel shell_history enabled"
66

77
ARG BUILD_WITHOUT_QUIC=false
8-
ARG OTP_VERSION=27.3.4.2-1
9-
ARG ELIXIR_VERSION=1.18.3
8+
ARG OTP_VERSION=28.1
9+
ARG ELIXIR_VERSION=1.18.4
1010
ARG RUST_VERSION=1.88.0
1111
ARG FDB_VERSION=7.3.43
12-
ARG EMQTT_BENCH_VERSION=0.4.25
12+
ARG EMQTT_BENCH_VERSION=0.5.3
1313
ARG LUX_VERSION=lux-3.0
1414

1515
COPY get-otp.sh get-zsh.sh get-elixir.sh get-fdb.sh get-rust.sh get-emqtt-bench.sh get-lux.sh /

RELEASE.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ List per major version used by EMQX, quic, rocksdb builds
22

33
OTP version from emqx/otp.git, Elixir version from elixir-lang/elixir.git.
44

5-
+ OTP-24.3.4.2-4,Elixir-1.15.7
6-
+ OTP-26.2.5.14-1,Elixir-1.15.7
5+
Uncomment older releases when there is an update.
6+
7+
# + OTP-24.3.4.2-4,Elixir-1.15.7
8+
# + OTP-26.2.5.14-1,Elixir-1.15.7
79
+ OTP-27.3.4.2-4,Elixir-1.18.3
10+
+ OTP-28.1,Elixir-1.18.4

get-emqtt-bench.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xeuo pipefail
44

5-
VSN="${1:-0.4.25}"
5+
VSN="${1:-0.5.3}"
66

77
. /etc/os-release
88
if [[ "${ID_LIKE:-}" =~ rhel|fedora ]]; then

get-otp.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ erl -eval '{ok, Version} = file:read_file(filename:join([code:root_dir(), "relea
6666
#########################
6767

6868
case "${OTP_VERSION}" in
69+
28*)
70+
REBAR3_VERSION="${REBAR3_VERSION:-3.25.1-emqx-1}"
71+
;;
6972
27*)
7073
REBAR3_VERSION="${REBAR3_VERSION:-3.20.0-emqx-6}"
7174
;;

0 commit comments

Comments
 (0)