From 3ebfa257e26f3132a980fac660e8d6d038b8a68d Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 8 Mar 2023 15:21:27 +0100 Subject: [PATCH 1/2] Add OTP 25.3 to the build and CI matrix as otp-max --- .bazelrc | 5 ++++- .github/workflows/oci.yaml | 2 +- .github/workflows/rabbitmq_peer_discovery_aws.yaml | 2 +- .github/workflows/test-selenium.yaml | 4 ++-- .github/workflows/test-windows.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- .github/workflows/update-otp-patches.yaml | 8 ++++++++ MODULE.bazel | 8 ++++++++ WORKSPACE | 12 ++++++++++++ bazel/platforms/BUILD.bazel | 9 +++++++++ packaging/docker-image/BUILD.bazel | 1 + 11 files changed, 49 insertions(+), 8 deletions(-) diff --git a/.bazelrc b/.bazelrc index f54ac024f6fb..45ce0533191e 100644 --- a/.bazelrc +++ b/.bazelrc @@ -45,7 +45,7 @@ build:rbe-24 --config=rbe build:rbe-24 --platforms=//bazel/platforms:erlang_linux_24_platform build:rbe-25 --config=rbe -build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_2_platform +build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_3_platform build:rbe-25_0 --config=rbe build:rbe-25_0 --platforms=//bazel/platforms:erlang_linux_25_0_platform @@ -56,6 +56,9 @@ build:rbe-25_1 --platforms=//bazel/platforms:erlang_linux_25_1_platform build:rbe-25_2 --config=rbe build:rbe-25_2 --platforms=//bazel/platforms:erlang_linux_25_2_platform +build:rbe-25_3 --config=rbe +build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform + # no-op config so that --config=local does not error build:local --color=auto diff --git a/.github/workflows/oci.yaml b/.github/workflows/oci.yaml index c5dd4a4c9a6e..5d112a9b3806 100644 --- a/.github/workflows/oci.yaml +++ b/.github/workflows/oci.yaml @@ -36,7 +36,7 @@ jobs: - image_tag_suffix: otp-min-bazel otp_version_id: 25_0 - image_tag_suffix: otp-max-bazel - otp_version_id: 25_2 + otp_version_id: 25_3 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/rabbitmq_peer_discovery_aws.yaml b/.github/workflows/rabbitmq_peer_discovery_aws.yaml index 5b9f677e1c88..f857a9a7d432 100644 --- a/.github/workflows/rabbitmq_peer_discovery_aws.yaml +++ b/.github/workflows/rabbitmq_peer_discovery_aws.yaml @@ -9,7 +9,7 @@ jobs: matrix: include: - image_tag_suffix: otp-max-bazel - otp_version_id: 25_2 + otp_version_id: 25_3 timeout-minutes: 45 steps: - name: CHECKOUT REPOSITORY diff --git a/.github/workflows/test-selenium.yaml b/.github/workflows/test-selenium.yaml index 38f325fc3fe6..d4f61943fe62 100644 --- a/.github/workflows/test-selenium.yaml +++ b/.github/workflows/test-selenium.yaml @@ -27,11 +27,11 @@ jobs: fail-fast: false matrix: erlang_version: - - "25.2" + - "25.3" browser: - chrome include: - - erlang_version: "25.2" + - erlang_version: "25.3" elixir_version: 1.13.4 env: SELENIUM_DIR: deps/rabbitmq_management/selenium diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index d3ff1e092851..b2948a3a1f61 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: include: - - erlang_version: "25.2" + - erlang_version: "25.3" elixir_version: 1.14.0 timeout-minutes: 120 steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b049ce34e3b9..4b39d3a35d8f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,7 +35,7 @@ jobs: matrix: otp_version_id: - 25_0 - - 25_2 + - 25_3 timeout-minutes: 120 steps: - name: CHECKOUT REPOSITORY @@ -81,7 +81,7 @@ jobs: include: - erlang_version: "25.0" elixir_version: 1.14.0 - - erlang_version: "25.2" + - erlang_version: "25.3" elixir_version: 1.14.0 timeout-minutes: 60 steps: diff --git a/.github/workflows/update-otp-patches.yaml b/.github/workflows/update-otp-patches.yaml index 0caf2a61e802..f908f8368a5c 100644 --- a/.github/workflows/update-otp-patches.yaml +++ b/.github/workflows/update-otp-patches.yaml @@ -16,6 +16,7 @@ jobs: - "25.0" - "25.1" - "25.2" + - "25.3" include: - erlang_version: "24.3" name: '24' @@ -41,6 +42,13 @@ jobs: backport-v3.12.x backport-v3.11.x backport-v3.10.x + - erlang_version: "25.3" + name: '25_3' + branch: main + labels: | + backport-v3.12.x + backport-v3.11.x + backport-v3.10.x timeout-minutes: 10 steps: - name: CHECKOUT REPOSITORY diff --git a/MODULE.bazel b/MODULE.bazel index 79ab66c825b5..3c60f8a10570 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -63,6 +63,12 @@ erlang_config.internal_erlang_from_github_release( version = "25.2.3", ) +erlang_config.internal_erlang_from_github_release( + name = "25_3", + sha256 = "85c447efc1746740df4089d75bc0e47b88d5161d7c44e9fc4c20fa33ea5d19d7", + version = "25.3", +) + erlang_config.internal_erlang_from_http_archive( name = "git_master", strip_prefix = "otp-master", @@ -106,6 +112,8 @@ register_toolchains( "@erlang_config//25_1:toolchain2", "@erlang_config//25_2:toolchain", "@erlang_config//25_2:toolchain2", + "@erlang_config//25_3:toolchain", + "@erlang_config//25_3:toolchain2", "@erlang_config//git_master:toolchain", "@erlang_config//git_master:toolchain2", "@elixir_config//external:toolchain", diff --git a/WORKSPACE b/WORKSPACE index 959fea0e9ed0..71cc126f0c73 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -83,6 +83,13 @@ http_file( urls = ["https://github.com/erlang/otp/archive/OTP-25.2.3.tar.gz"], ) +http_file( + name = "otp_src_25_3", + downloaded_file_path = "OTP-25.3.tar.gz", + sha256 = "f4fc2c5e1da56eb659003015ab80c42e50cef1129cca8c14457a522d1793498d", + urls = ["https://github.com/erlang/otp/archive/OTP-25.3.tar.gz"], +) + http_archive( name = "io_buildbuddy_buildbuddy_toolchain", sha256 = "a2a5cccec251211e2221b1587af2ce43c36d32a42f5d881737db3b546a536510", @@ -119,6 +126,11 @@ erlang_config( sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c", version = "25.2.3", ), + internal_erlang_from_github_release( + name = "25_3", + sha256 = "85c447efc1746740df4089d75bc0e47b88d5161d7c44e9fc4c20fa33ea5d19d7", + version = "25.3", + ), internal_erlang_from_http_archive( name = "git_master", strip_prefix = "otp-master", diff --git a/bazel/platforms/BUILD.bazel b/bazel/platforms/BUILD.bazel index aca4d9a70133..9ec10da0f991 100644 --- a/bazel/platforms/BUILD.bazel +++ b/bazel/platforms/BUILD.bazel @@ -47,6 +47,15 @@ platform( parents = ["@rbe//config:platform"], ) +platform( + name = "erlang_linux_25_3_platform", + constraint_values = [ + "@erlang_config//:erlang_25_3", + "@elixir_config//:elixir_1_14", + ], + parents = ["@rbe//config:platform"], +) + platform( name = "erlang_linux_git_master_platform", constraint_values = [ diff --git a/packaging/docker-image/BUILD.bazel b/packaging/docker-image/BUILD.bazel index 7c896f221fb2..fbe721f20530 100644 --- a/packaging/docker-image/BUILD.bazel +++ b/packaging/docker-image/BUILD.bazel @@ -124,6 +124,7 @@ container_image( "@erlang_config//:erlang_25_0": ["@otp_src_25_0//file"], "@erlang_config//:erlang_25_1": ["@otp_src_25_1//file"], "@erlang_config//:erlang_25_2": ["@otp_src_25_2//file"], + "@erlang_config//:erlang_25_3": ["@otp_src_25_3//file"], }), ) From ba9c43de16ad977a740fe39641015c24e1c8a86c Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 8 Mar 2023 17:41:38 +0100 Subject: [PATCH 2/2] Fix a dialyzer error revealed by otp 25.3 --- deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl index 674ac8252f64..917f1619e215 100644 --- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl +++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl @@ -665,8 +665,7 @@ auth_phase_1_0(Response, rabbit_core_metrics:auth_attempt_succeeded(<<>>, <<>>, amqp10), Secure = #'v1_0.sasl_challenge'{challenge = {binary, Challenge}}, ok = send_on_channel0(Sock, Secure, rabbit_amqp1_0_sasl), - State#v1{connection = Connection = - #v1_connection{auth_state = AuthState1}}; + State#v1{connection = Connection#v1_connection{auth_state = AuthState1}}; {ok, User = #user{username = Username}} -> case rabbit_access_control:check_user_loopback(Username, Sock) of ok ->