Skip to content

Commit f2fa293

Browse files
Merge pull request #10297 from rabbitmq/adopt-otp-26.2
Adopt OTP 26.2.1
2 parents 3cd832b + 8d2657e commit f2fa293

File tree

7 files changed

+31
-3
lines changed

7 files changed

+31
-3
lines changed

.bazelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,14 @@ build:rbe-25_3 --config=rbe
6868
build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform
6969

7070
build:rbe-26 --config=rbe
71-
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_1_platform
71+
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_2_platform
7272

7373
build:rbe-26_1 --config=rbe
7474
build:rbe-26_1 --platforms=//bazel/platforms:erlang_linux_26_1_platform
7575

76+
build:rbe-26_2 --config=rbe
77+
build:rbe-26_2 --platforms=//bazel/platforms:erlang_linux_26_2_platform
78+
7679
# no-op config so that --config=local does not error
7780
build:local --color=auto
7881

.github/workflows/oci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- image_tag_suffix: otp-min-bazel
3737
otp_version_id: 26_1
3838
- image_tag_suffix: otp-max-bazel
39-
otp_version_id: 26_1
39+
otp_version_id: 26_2
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v4

.github/workflows/rabbitmq_peer_discovery_aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix:
1818
include:
1919
- image_tag_suffix: otp-max-bazel
20-
otp_version_id: 26_1
20+
otp_version_id: 26_2
2121
timeout-minutes: 45
2222
steps:
2323
- name: CHECKOUT REPOSITORY

MODULE.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ erlang_config.internal_erlang_from_github_release(
100100
version = "26.1.2",
101101
)
102102

103+
erlang_config.internal_erlang_from_github_release(
104+
name = "26_2",
105+
sha256 = "80d66bafbae409481a4e1badcb4a6275b07a8e9af82980c08d7a8add483232a9",
106+
version = "26.2.1",
107+
)
108+
103109
erlang_config.internal_erlang_from_http_archive(
104110
name = "git_master",
105111
strip_prefix = "otp-master",
@@ -153,6 +159,8 @@ register_toolchains(
153159
"@erlang_config//25_3:toolchain_major_minor",
154160
"@erlang_config//26_1:toolchain_major",
155161
"@erlang_config//26_1:toolchain_major_minor",
162+
"@erlang_config//26_2:toolchain_major",
163+
"@erlang_config//26_2:toolchain_major_minor",
156164
"@erlang_config//git_master:toolchain_major",
157165
"@erlang_config//git_master:toolchain_major_minor",
158166
"@elixir_config//external:toolchain",

WORKSPACE

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ http_file(
112112
urls = ["https://github.com/erlang/otp/archive/OTP-26.1.2.tar.gz"],
113113
)
114114

115+
http_file(
116+
name = "otp_src_26_2",
117+
downloaded_file_path = "OTP-26.2.1.tar.gz",
118+
sha256 = "d99eab3af908b41dd4d7df38f0b02a447579326dd6604f641bbe9f2789b5656b",
119+
urls = ["https://github.com/erlang/otp/archive/OTP-26.2.1.tar.gz"],
120+
)
121+
115122
new_git_repository(
116123
name = "bats",
117124
build_file = "@//:BUILD.bats",

bazel/platforms/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ platform(
6565
parents = ["@rbe//config:platform"],
6666
)
6767

68+
platform(
69+
name = "erlang_linux_26_2_platform",
70+
constraint_values = [
71+
"@erlang_config//:erlang_26_2",
72+
"@elixir_config//:elixir_1_15",
73+
],
74+
parents = ["@rbe//config:platform"],
75+
)
76+
6877
platform(
6978
name = "erlang_linux_git_master_platform",
7079
constraint_values = [

packaging/docker-image/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ container_image(
142142
"@erlang_config//:erlang_25_2": ["@otp_src_25_2//file"],
143143
"@erlang_config//:erlang_25_3": ["@otp_src_25_3//file"],
144144
"@erlang_config//:erlang_26_1": ["@otp_src_26_1//file"],
145+
"@erlang_config//:erlang_26_2": ["@otp_src_26_2//file"],
145146
}),
146147
)
147148

0 commit comments

Comments
 (0)