diff options
| author | Michael Klishin <klishinm@vmware.com> | 2022-08-05 17:32:39 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-05 17:32:39 +0400 |
| commit | 3ffe803a3736f1a92ab26ce161f1cc9ac47f1c19 (patch) | |
| tree | e60647873132157029bc3683b7a2a3c74d4d83a7 | |
| parent | 3de04024676a8144a77331d8d509b1e328a12dfb (diff) | |
| parent | 0a43f9147d18918f4c8062e439a25287fac9b208 (diff) | |
| download | rabbitmq-server-git-3ffe803a3736f1a92ab26ce161f1cc9ac47f1c19.tar.gz | |
Merge pull request #5448 from rabbitmq/mergify/bp/v3.11.x/pr-5447
Require Erlang 24.3 (backport #5447)
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl | 4 | ||||
| -rw-r--r-- | deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl index eb19bbe86e..504db7b5aa 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl @@ -6,8 +6,8 @@ -export([check/1]). --define(OTP_MINIMUM, "23.2"). --define(ERTS_MINIMUM, "11.1"). +-define(OTP_MINIMUM, "24.3"). +-define(ERTS_MINIMUM, "12.3"). check(_Context) -> ?LOG_DEBUG( diff --git a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh index 8fb5a4d708..6c9960c1af 100644 --- a/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh +++ b/deps/rabbitmq_ct_helpers/tools/terraform/direct-vms/templates/setup-erlang.sh @@ -34,12 +34,13 @@ readonly erlang_cookie='${erlang_cookie}' readonly debian_codename="$${distribution#debian-*}" case "$erlang_version" in - 24.*) + + 26.*) if test -z "$erlang_git_ref"; then erlang_git_ref='master' fi ;; - 23.*|22.*|21.*|20.*|19.3) + 25.*|24.*|23.*|22.*|21.*|20.*|19.3) readonly erlang_package_version="1:$erlang_version-1" ;; R16B03) |