diff options
author | Michael Klishin <michael@clojurewerkz.org> | 2022-09-18 22:19:37 +0400 |
---|---|---|
committer | Michael Klishin <michael@clojurewerkz.org> | 2022-09-18 22:19:37 +0400 |
commit | 58375d03488cb728e471593d78c74108a3345265 (patch) | |
tree | b0b240f9a412f3b3e6ba966aabf589c6d8743ced | |
parent | 11fe2ccc82521526258ada48c58b47690450888e (diff) | |
download | rabbitmq-server-git-58375d03488cb728e471593d78c74108a3345265.tar.gz |
Require Erlang/OTP 25.0 (3.11 and 3.12/main only)
So that we can be sure that the JIT is available for both amd64
and arm64 users, and we benefit from all the latest compiler and runtime
optimization work.
-rw-r--r-- | .github/workflows/oci.yaml | 14 | ||||
-rw-r--r-- | .github/workflows/perform-bazel-execution-comparison.yaml | 8 | ||||
-rw-r--r-- | .github/workflows/secondary-umbrella.yaml | 6 | ||||
-rw-r--r-- | .github/workflows/test-mixed-versions.yaml | 5 | ||||
-rw-r--r-- | .github/workflows/test-windows.yaml | 4 | ||||
-rw-r--r-- | .github/workflows/test.yaml | 7 | ||||
-rw-r--r-- | .github/workflows/update-otp-patches.yaml | 2 | ||||
-rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl | 4 | ||||
-rw-r--r-- | user-template.bazelrc | 6 |
9 files changed, 23 insertions, 33 deletions
diff --git a/.github/workflows/oci.yaml b/.github/workflows/oci.yaml index 6038c679af..84cbe9a150 100644 --- a/.github/workflows/oci.yaml +++ b/.github/workflows/oci.yaml @@ -19,13 +19,13 @@ jobs: # This job will build one docker image per supported Erlang major version. # Each image will have two tags (one containing the Git commit SHA, one containing the branch name). # - # For example, for Git commit SHA '111aaa' and branch name 'main' and maximum supported Erlang major version '24', + # For example, for Git commit SHA '111aaa' and branch name 'main' and maximum supported Erlang major version '26', # the following tags will be pushed to Dockerhub: # - # * 111aaa-otp-min (image OTP 24) - # * main-otp-min (image OTP 24) - # * 111aaa-otp-max (image OTP 25) - # * main-otp-max (image OTP 25) + # * 111aaa-otp-min (image OTP 25) + # * main-otp-min (image OTP 25) + # * 111aaa-otp-max (image OTP 26) + # * main-otp-max (image OTP 26) build-publish-dev: runs-on: ubuntu-latest @@ -36,7 +36,7 @@ jobs: # Source of truth for OTP versions (min & max): https://www.rabbitmq.com/which-erlang.html include: - image_tag_suffix: otp-min - otp_major: 24 + otp_major: 25 - image_tag_suffix: otp-max otp_major: 25 steps: @@ -171,7 +171,7 @@ jobs: matrix: include: - image_tag_suffix: otp-min-bazel - otp_major: 24 + otp_major: 25 - image_tag_suffix: otp-max-bazel otp_major: 25 steps: diff --git a/.github/workflows/perform-bazel-execution-comparison.yaml b/.github/workflows/perform-bazel-execution-comparison.yaml index c2be55b9e1..60186069b0 100644 --- a/.github/workflows/perform-bazel-execution-comparison.yaml +++ b/.github/workflows/perform-bazel-execution-comparison.yaml @@ -13,9 +13,9 @@ jobs: strategy: matrix: erlang_version: - - "24" + - "25" include: - - erlang_version: "24" + - erlang_version: "25" cache_name: ci-bazel-cache-analysis timeout-minutes: 120 steps: @@ -48,9 +48,9 @@ jobs: strategy: matrix: erlang_version: - - "24" + - "25" include: - - erlang_version: "24" + - erlang_version: "25" cache_name: ci-bazel-cache-analysis timeout-minutes: 120 steps: diff --git a/.github/workflows/secondary-umbrella.yaml b/.github/workflows/secondary-umbrella.yaml index 1c9745cc9a..3d0517ec65 100644 --- a/.github/workflows/secondary-umbrella.yaml +++ b/.github/workflows/secondary-umbrella.yaml @@ -45,7 +45,7 @@ jobs: "+{parse_transform,lager_transform}", "+{lager_extra_sinks,[" + ",".join(_LAGER_EXTRA_SINKS) + "]}", ] - - erlang_major: "24" + - erlang_major: "25" tag: v3.9.13 patch: | diff --git a/rabbitmq.bzl b/rabbitmq.bzl @@ -64,8 +64,8 @@ jobs: RABBITMQ_TEST_ERLC_OPTS = DEFAULT_TEST_ERLC_OPTS + [ "+nowarn_export_all", - - erlang_major: "24" - tag: v3.10.6 + - erlang_major: "25" + tag: v3.10.7 patch: | diff --git a/MODULE.bazel b/MODULE.bazel index bbc541b766..9290f13053 100644 diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml index 98e4a03b91..26184ac880 100644 --- a/.github/workflows/test-mixed-versions.yaml +++ b/.github/workflows/test-mixed-versions.yaml @@ -35,7 +35,6 @@ jobs: fail-fast: false matrix: erlang_major: - - "24" - "25" timeout-minutes: 120 steps: @@ -77,10 +76,8 @@ jobs: strategy: matrix: include: - - erlang_version: "24" - elixir_version: 1.12.3 - erlang_version: "25" - elixir_version: 1.13.4 + elixir_version: 1.14.0 timeout-minutes: 60 steps: - name: CHECKOUT REPOSITORY diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index 58777d2547..d5a6f3de9d 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -11,10 +11,8 @@ jobs: fail-fast: false matrix: include: - - erlang_version: "24" - elixir_version: 1.12.3 - erlang_version: "25" - elixir_version: 1.13.4 + elixir_version: 1.14.0 timeout-minutes: 120 steps: - name: CHECKOUT REPOSITORY diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 71bc530235..0eed4714b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -34,7 +34,6 @@ jobs: fail-fast: false matrix: erlang_major: - - "24" - "25" timeout-minutes: 120 steps: @@ -79,10 +78,8 @@ jobs: fail-fast: false matrix: include: - - erlang_version: "24" - elixir_version: 1.12.3 - #! - erlang_version: "25" - #! elixir_version: 1.13.4 + - erlang_version: "25" + elixir_version: 1.14.0 timeout-minutes: 60 steps: - name: CHECKOUT REPOSITORY diff --git a/.github/workflows/update-otp-patches.yaml b/.github/workflows/update-otp-patches.yaml index fb5894deb0..7f9cfc4d87 100644 --- a/.github/workflows/update-otp-patches.yaml +++ b/.github/workflows/update-otp-patches.yaml @@ -12,8 +12,6 @@ jobs: fail-fast: false matrix: include: - - erlang_version: "24.3" - name_suffix: '_24' - erlang_version: "25.0" name_suffix: '_25' timeout-minutes: 10 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 504db7b5aa..39210cb5b5 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, "24.3"). --define(ERTS_MINIMUM, "12.3"). +-define(OTP_MINIMUM, "25.0"). +-define(ERTS_MINIMUM, "13.0"). check(_Context) -> ?LOG_DEBUG( diff --git a/user-template.bazelrc b/user-template.bazelrc index b4eadf34de..42dfb2955e 100644 --- a/user-template.bazelrc +++ b/user-template.bazelrc @@ -1,6 +1,6 @@ -build:local --@rules_erlang//:erlang_home=/Users/rabbitmq/kerl/24.0 -build:local --@rules_erlang//:erlang_version=24.0 -build:local --//:elixir_home=/Users/rabbitmq/.kiex/elixirs/elixir-1.12.0/lib/elixir +build:local --@rules_erlang//:erlang_home=/Users/rabbitmq/kerl/25.0 +build:local --@rules_erlang//:erlang_version=25.0 +build:local --//:elixir_home=/Users/rabbitmq/.kiex/elixirs/elixir-1.14.0/lib/elixir # rabbitmqctl wait shells out to 'ps', which is broken in the bazel macOS # sandbox (https://github.com/bazelbuild/bazel/issues/7448) |