Skip to content

Commit 7a7cfe2

Browse files
authored
Merge pull request #127 from emqx/250114-bump-otp-versions
bump: OTP 26 and 27 to include fix for external_copy schema merge
2 parents 0079f3a + 37177d5 commit 7a7cfe2

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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.1-1
8+
ARG OTP_VERSION=27.2-2
99
ARG ELIXIR_VERSION=1.17.3
1010
ARG FDB_VERSION=7.3.43
1111
ARG EMQTT_BENCH_VERSION=0.4.25
@@ -20,7 +20,7 @@ RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/en
2020
which g++ && g++ --version && \
2121
/get-zsh.sh && \
2222
/get-otp.sh ${OTP_VERSION} && \
23-
/get-elixir.sh ${ELIXIR_VERSION} && \
23+
/get-elixir.sh ${ELIXIR_VERSION} && \
2424
/get-fdb.sh ${FDB_VERSION} && \
2525
/get-emqtt-bench.sh ${EMQTT_BENCH_VERSION} && \
2626
/get-lux.sh ${LUX_VERSION} && \

RELEASE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ OTP version from emqx/otp.git, Elixir version from elixir-lang/elixir.git.
44

55
+ OTP-24.3.4.2-4,Elixir-1.15.7
66
+ OTP-25.3.2-2,Elixir-1.15.7
7-
+ OTP-26.2.5.2-2,Elixir-1.15.7
8-
+ OTP-27.2-1,Elixir-1.17.3
7+
+ OTP-26.2.5.2-3,Elixir-1.15.7
8+
+ OTP-27.2-2,Elixir-1.17.3

get-otp.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ ROOT='/'
1010
cd "$ROOT"
1111

1212
name="OTP-${OTP_VERSION}"
13-
curl --silent --show-error -fkL "https://github.com/emqx/otp/archive/${name}.zip" -o "${name}.zip"
13+
download_url="https://github.com/emqx/otp/archive/${name}.zip"
14+
echo "Downloading ${download_url}"
15+
curl --silent --show-error -fkL ${download_url} -o "${name}.zip"
1416

1517
unzip -q "$name.zip"
1618
rm -f "$name.zip"

0 commit comments

Comments
 (0)