Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OTP 25.3 to the build and CI matrix as otp-max (backport #7540) (backport #7543) (backport #7545) #7546

Merged
merged 3 commits into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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

# no-op config so that --config=local does not error
build:local --color=auto
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
- image_tag_suffix: otp-min-bazel
otp_version_id: 24
- image_tag_suffix: otp-max-bazel
otp_version_id: 25_2
otp_version_id: 25_3
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rabbitmq_peer_discovery_aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
matrix:
include:
- image_tag_suffix: otp-max-bazel
otp_version_id: 25_2
otp_version_id: 25_3
otp_major: 25
timeout-minutes: 45
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-selenium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
include:
- erlang_version: "24"
elixir_version: 1.13.4
- erlang_version: "25.2"
- erlang_version: "25.3"
elixir_version: 1.14.0
timeout-minutes: 120
steps:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,15 @@ jobs:
strategy:
fail-fast: false
matrix:
<<<<<<< HEAD
erlang_major:
- "24"
- "25"
=======
otp_version_id:
- 25_0
- 25_3
>>>>>>> 8a82109fcf (Add OTP 25.3 to the build and CI matrix as otp-max)
timeout-minutes: 120
steps:
- name: CHECKOUT REPOSITORY
Expand Down Expand Up @@ -77,7 +83,7 @@ jobs:
include:
- erlang_version: "24"
elixir_version: 1.13.4
- erlang_version: "25.2"
- erlang_version: "25.3"
elixir_version: 1.14.0
timeout-minutes: 60
steps:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/update-otp-patches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- "25.0"
- "25.1"
- "25.2"
- "25.3"
include:
- erlang_version: "24.3"
name: '24'
Expand All @@ -39,6 +40,13 @@ jobs:
labels: |
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
Expand Down
8 changes: 8 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 12 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -124,6 +131,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",
Expand Down
9 changes: 9 additions & 0 deletions bazel/platforms/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
3 changes: 1 addition & 2 deletions deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,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 ->
Expand Down
1 change: 1 addition & 0 deletions packaging/docker-image/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
}),
)

Expand Down