Skip to content

Commit dff78e1

Browse files
Merge pull request #7540 from rabbitmq/add-erlang-25.3-to-matrix
2 parents 746373a + ba9c43d commit dff78e1

File tree

12 files changed

+50
-10
lines changed

12 files changed

+50
-10
lines changed

.bazelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ build:rbe-24 --config=rbe
4545
build:rbe-24 --platforms=//bazel/platforms:erlang_linux_24_platform
4646

4747
build:rbe-25 --config=rbe
48-
build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_2_platform
48+
build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_3_platform
4949

5050
build:rbe-25_0 --config=rbe
5151
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
5656
build:rbe-25_2 --config=rbe
5757
build:rbe-25_2 --platforms=//bazel/platforms:erlang_linux_25_2_platform
5858

59+
build:rbe-25_3 --config=rbe
60+
build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform
61+
5962
# no-op config so that --config=local does not error
6063
build:local --color=auto
6164

.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: 25_0
3838
- image_tag_suffix: otp-max-bazel
39-
otp_version_id: 25_2
39+
otp_version_id: 25_3
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v3

.github/workflows/rabbitmq_peer_discovery_aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
matrix:
1010
include:
1111
- image_tag_suffix: otp-max-bazel
12-
otp_version_id: 25_2
12+
otp_version_id: 25_3
1313
timeout-minutes: 45
1414
steps:
1515
- name: CHECKOUT REPOSITORY

.github/workflows/test-selenium.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
erlang_version:
30-
- "25.2"
30+
- "25.3"
3131
browser:
3232
- chrome
3333
include:
34-
- erlang_version: "25.2"
34+
- erlang_version: "25.3"
3535
elixir_version: 1.13.4
3636
env:
3737
SELENIUM_DIR: deps/rabbitmq_management/selenium

.github/workflows/test-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- erlang_version: "25.2"
17+
- erlang_version: "25.3"
1818
elixir_version: 1.14.0
1919
timeout-minutes: 120
2020
steps:

.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
matrix:
3636
otp_version_id:
3737
- 25_0
38-
- 25_2
38+
- 25_3
3939
timeout-minutes: 120
4040
steps:
4141
- name: CHECKOUT REPOSITORY
@@ -81,7 +81,7 @@ jobs:
8181
include:
8282
- erlang_version: "25.0"
8383
elixir_version: 1.14.0
84-
- erlang_version: "25.2"
84+
- erlang_version: "25.3"
8585
elixir_version: 1.14.0
8686
timeout-minutes: 60
8787
steps:

.github/workflows/update-otp-patches.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- "25.0"
1717
- "25.1"
1818
- "25.2"
19+
- "25.3"
1920
include:
2021
- erlang_version: "24.3"
2122
name: '24'
@@ -41,6 +42,13 @@ jobs:
4142
backport-v3.12.x
4243
backport-v3.11.x
4344
backport-v3.10.x
45+
- erlang_version: "25.3"
46+
name: '25_3'
47+
branch: main
48+
labels: |
49+
backport-v3.12.x
50+
backport-v3.11.x
51+
backport-v3.10.x
4452
timeout-minutes: 10
4553
steps:
4654
- name: CHECKOUT REPOSITORY

MODULE.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ erlang_config.internal_erlang_from_github_release(
6363
version = "25.2.3",
6464
)
6565

66+
erlang_config.internal_erlang_from_github_release(
67+
name = "25_3",
68+
sha256 = "85c447efc1746740df4089d75bc0e47b88d5161d7c44e9fc4c20fa33ea5d19d7",
69+
version = "25.3",
70+
)
71+
6672
erlang_config.internal_erlang_from_http_archive(
6773
name = "git_master",
6874
strip_prefix = "otp-master",
@@ -106,6 +112,8 @@ register_toolchains(
106112
"@erlang_config//25_1:toolchain2",
107113
"@erlang_config//25_2:toolchain",
108114
"@erlang_config//25_2:toolchain2",
115+
"@erlang_config//25_3:toolchain",
116+
"@erlang_config//25_3:toolchain2",
109117
"@erlang_config//git_master:toolchain",
110118
"@erlang_config//git_master:toolchain2",
111119
"@elixir_config//external:toolchain",

WORKSPACE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ http_file(
8383
urls = ["https://github.com/erlang/otp/archive/OTP-25.2.3.tar.gz"],
8484
)
8585

86+
http_file(
87+
name = "otp_src_25_3",
88+
downloaded_file_path = "OTP-25.3.tar.gz",
89+
sha256 = "f4fc2c5e1da56eb659003015ab80c42e50cef1129cca8c14457a522d1793498d",
90+
urls = ["https://github.com/erlang/otp/archive/OTP-25.3.tar.gz"],
91+
)
92+
8693
http_archive(
8794
name = "io_buildbuddy_buildbuddy_toolchain",
8895
sha256 = "a2a5cccec251211e2221b1587af2ce43c36d32a42f5d881737db3b546a536510",
@@ -119,6 +126,11 @@ erlang_config(
119126
sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
120127
version = "25.2.3",
121128
),
129+
internal_erlang_from_github_release(
130+
name = "25_3",
131+
sha256 = "85c447efc1746740df4089d75bc0e47b88d5161d7c44e9fc4c20fa33ea5d19d7",
132+
version = "25.3",
133+
),
122134
internal_erlang_from_http_archive(
123135
name = "git_master",
124136
strip_prefix = "otp-master",

bazel/platforms/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ platform(
4747
parents = ["@rbe//config:platform"],
4848
)
4949

50+
platform(
51+
name = "erlang_linux_25_3_platform",
52+
constraint_values = [
53+
"@erlang_config//:erlang_25_3",
54+
"@elixir_config//:elixir_1_14",
55+
],
56+
parents = ["@rbe//config:platform"],
57+
)
58+
5059
platform(
5160
name = "erlang_linux_git_master_platform",
5261
constraint_values = [

0 commit comments

Comments
 (0)