root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7540 from rabbitmq/add-erlang-25.3-to-matrix

This commit is contained in:
Michael Klishin 2023-03-08 21:35:43 +04:00 committed by GitHub
parent 746373a50b ba9c43de16
commit dff78e1c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.bazelrc
View File

@ -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

2
.github/workflows/oci.yaml vendored
View File

@ -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

2
.github/workflows/rabbitmq_peer_discovery_aws.yaml vendored
View File

@ -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

4
.github/workflows/test-selenium.yaml vendored
View File

@ -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

2
.github/workflows/test-windows.yaml vendored
View File

@ -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:

4
.github/workflows/test.yaml vendored
View File

@ -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:

8
.github/workflows/update-otp-patches.yaml vendored
View File

@ -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

8
MODULE.bazel
View File

@ -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",

12
WORKSPACE
View File

@ -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",

9
bazel/platforms/BUILD.bazel
View File

@ -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 = [

3
deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl vendored
View File

@ -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 ->

1
packaging/docker-image/BUILD.bazel
View File

@ -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"],
}),
)