From da0575cf01a3f38abaa68d2e7d0759cc930c7003 Mon Sep 17 00:00:00 2001 From: zmstone <zmstone@gmail.com> Date: Tue, 14 Jan 2025 09:29:01 +0100 Subject: [PATCH] bump: OTP 26 and 27 to include fix for external_copy schema merge --- Dockerfile | 4 ++-- RELEASE.md | 4 ++-- get-otp.sh | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32403f3..143e472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV EMQX_BUILDER_IMAGE=${BUILD_FROM} ENV ERL_AFLAGS="-kernel shell_history enabled" ARG BUILD_WITHOUT_QUIC=false -ARG OTP_VERSION=27.1-1 +ARG OTP_VERSION=27.1-3 ARG ELIXIR_VERSION=1.17.3 ARG FDB_VERSION=7.3.43 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 which g++ && g++ --version && \ /get-zsh.sh && \ /get-otp.sh ${OTP_VERSION} && \ - /get-elixir.sh ${ELIXIR_VERSION} && \ + /get-elixir.sh ${ELIXIR_VERSION} && \ /get-fdb.sh ${FDB_VERSION} && \ /get-emqtt-bench.sh ${EMQTT_BENCH_VERSION} && \ /get-lux.sh ${LUX_VERSION} && \ diff --git a/RELEASE.md b/RELEASE.md index afb9fad..1e5763b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,5 +4,5 @@ OTP version from emqx/otp.git, Elixir version from elixir-lang/elixir.git. + OTP-24.3.4.2-4,Elixir-1.15.7 + OTP-25.3.2-2,Elixir-1.15.7 -+ OTP-26.2.5.2-2,Elixir-1.15.7 -+ OTP-27.2-1,Elixir-1.17.3 ++ OTP-26.2.5.2-3,Elixir-1.15.7 ++ OTP-27.1-3,Elixir-1.17.3 diff --git a/get-otp.sh b/get-otp.sh index e1845cf..6354440 100755 --- a/get-otp.sh +++ b/get-otp.sh @@ -10,7 +10,9 @@ ROOT='/' cd "$ROOT" name="OTP-${OTP_VERSION}" -curl --silent --show-error -fkL "https://github.com/emqx/otp/archive/${name}.zip" -o "${name}.zip" +download_url="https://github.com/emqx/otp/archive/${name}.zip" +echo "Downloading ${download_url}" +curl --silent --show-error -fkL ${download_url} -o "${name}.zip" unzip -q "$name.zip" rm -f "$name.zip"