Skip to content

Commit db9425e

Browse files
Merge pull request #9486 from rabbitmq/rin/use-otp-26.1
Use OTP 26.1 as OTP 26 in CI
2 parents 0ce931a + 75eb062 commit db9425e

12 files changed

+31
-28
lines changed

.bazelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ build:rbe-25_3 --config=rbe
6767
build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform
6868

6969
build:rbe-26 --config=rbe
70-
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_platform
70+
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_1_platform
71+
72+
build:rbe-26_1 --config=rbe
73+
build:rbe-26_1 --platforms=//bazel/platforms:erlang_linux_26_1_platform
7174

7275
# no-op config so that --config=local does not error
7376
build:local --color=auto

.github/workflows/check-build-system-equivalence-release-branches.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ jobs:
77
uses: ./.github/workflows/check-build-system-equivalence.yaml
88
with:
99
ref: refs/heads/main
10-
erlang_version: 26.0
10+
erlang_version: 26.1
1111
elixir_version: 1.15
1212
project_version: 3.13.0
1313

1414
check-v3_12_x:
1515
uses: ./.github/workflows/check-build-system-equivalence.yaml
1616
with:
1717
ref: refs/heads/v3.12.x
18-
erlang_version: 26.0
18+
erlang_version: 26.1
1919
elixir_version: 1.15
2020
project_version: 3.12.0
2121

2222
check-v3_11_x:
2323
uses: ./.github/workflows/check-build-system-equivalence.yaml
2424
with:
2525
ref: refs/heads/v3.11.x
26-
erlang_version: 26.0
26+
erlang_version: 26.1
2727
elixir_version: 1.15
2828
project_version: 3.11.0

.github/workflows/check-build-system-equivalence.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
erlang_version:
2020
description: 'OTP version to build with'
2121
required: true
22-
default: "26.0"
22+
default: "26.1"
2323
elixir_version:
2424
description: 'Elixir version to build with'
2525
required: true

.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_3
3838
- image_tag_suffix: otp-max-bazel
39-
otp_version_id: 26
39+
otp_version_id: 26_1
4040
steps:
4141
- name: Free Disk Space (Ubuntu)
4242
uses: jlumbroso/free-disk-space@main

.github/workflows/test-authnz.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
erlang_version:
34-
- "26.0"
34+
- "26.1"
3535
browser:
3636
- chrome
3737
include:
38-
- erlang_version: "26.0"
39-
elixir_version: 1.14.5
38+
- erlang_version: "26.1"
39+
elixir_version: 1.15.2
4040
env:
4141
SELENIUM_DIR: deps/rabbitmq_management/selenium
4242
DOCKER_NETWORK: rabbitmq_net

.github/workflows/test-selenium.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
erlang_version:
34-
- "26.0"
34+
- "26.1"
3535
browser:
3636
- chrome
3737
include:
38-
- erlang_version: "26.0"
39-
elixir_version: 1.14.5
38+
- erlang_version: "26.1"
39+
elixir_version: 1.15.2
4040
env:
4141
SELENIUM_DIR: deps/rabbitmq_management/selenium
4242
DOCKER_NETWORK: rabbitmq_net

.github/workflows/test-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- erlang_version: "26.0"
14+
- erlang_version: "26.1"
1515
elixir_version: "1.15.2"
1616
timeout-minutes: 120
1717
steps:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- "25.1"
1818
- "25.2"
1919
- "25.3"
20-
- "26.0"
20+
- "26.1"
2121
include:
2222
- erlang_version: "24.3"
2323
name: '24'
@@ -50,8 +50,8 @@ jobs:
5050
backport-v3.12.x
5151
backport-v3.11.x
5252
backport-v3.10.x
53-
- erlang_version: "26.0"
54-
name: '26'
53+
- erlang_version: "26.1"
54+
name: '26_1'
5555
branch: main
5656
labels: |
5757
backport-v3.12.x

MODULE.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ erlang_config.internal_erlang_from_github_release(
9595
)
9696

9797
erlang_config.internal_erlang_from_github_release(
98-
name = "26",
99-
sha256 = "47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193",
100-
version = "26.0.2",
98+
name = "26_1",
99+
sha256 = "f914ddea79019ab2533911cdd4f91653726ac9b0561b3ec57aa6ecbcc3df3f55",
100+
version = "26.1",
101101
)
102102

103103
erlang_config.internal_erlang_from_http_archive(
@@ -151,8 +151,8 @@ register_toolchains(
151151
"@erlang_config//25_2:toolchain_major_minor",
152152
"@erlang_config//25_3:toolchain_major",
153153
"@erlang_config//25_3:toolchain_major_minor",
154-
"@erlang_config//26:toolchain_major",
155-
"@erlang_config//26:toolchain_major_minor",
154+
"@erlang_config//26_1:toolchain_major",
155+
"@erlang_config//26_1:toolchain_major_minor",
156156
"@erlang_config//git_master:toolchain_major",
157157
"@erlang_config//git_master:toolchain_major_minor",
158158
"@elixir_config//external:toolchain",

WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ http_file(
106106
)
107107

108108
http_file(
109-
name = "otp_src_26",
110-
downloaded_file_path = "OTP-26.0.2.tar.gz",
111-
sha256 = "4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470",
112-
urls = ["https://github.com/erlang/otp/archive/OTP-26.0.2.tar.gz"],
109+
name = "otp_src_26_1",
110+
downloaded_file_path = "OTP-26.1.tar.gz",
111+
sha256 = "09864524516bd26be040ae9ee09d70ce38ded2bcec041bc36081313b5031dfe8",
112+
urls = ["https://github.com/erlang/otp/archive/OTP-26.1.tar.gz"],
113113
)
114114

115115
new_git_repository(

bazel/platforms/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ platform(
5757
)
5858

5959
platform(
60-
name = "erlang_linux_26_platform",
60+
name = "erlang_linux_26_1_platform",
6161
constraint_values = [
62-
"@erlang_config//:erlang_26",
62+
"@erlang_config//:erlang_26_1",
6363
"@elixir_config//:elixir_1_15",
6464
],
6565
parents = ["@rbe//config:platform"],

packaging/docker-image/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ container_image(
141141
"@erlang_config//:erlang_25_1": ["@otp_src_25_1//file"],
142142
"@erlang_config//:erlang_25_2": ["@otp_src_25_2//file"],
143143
"@erlang_config//:erlang_25_3": ["@otp_src_25_3//file"],
144-
"@erlang_config//:erlang_26_0": ["@otp_src_26//file"],
144+
"@erlang_config//:erlang_26_1": ["@otp_src_26_1//file"],
145145
}),
146146
)
147147

0 commit comments

Comments
 (0)