Skip to content

Commit a9a9185

Browse files
Merge pull request #9491 from rabbitmq/mergify/bp/v3.12.x/pr-9486
Use OTP 26.1 as OTP 26 in CI (backport #9486)
2 parents aaadb8e + 862b658 commit a9a9185

12 files changed

+35
-32
lines changed

.bazelrc

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

6767
build:rbe-26 --config=rbe
68-
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_platform
68+
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_1_platform
69+
70+
build:rbe-26_1 --config=rbe
71+
build:rbe-26_1 --platforms=//bazel/platforms:erlang_linux_26_1_platform
6972

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ jobs:
66
check-main:
77
uses: ./.github/workflows/check-build-system-equivalence.yaml
88
with:
9-
ref: main
10-
erlang_version: 26.0
9+
ref: refs/heads/main
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:
17-
ref: v3.12.x
18-
erlang_version: 26.0
17+
ref: refs/heads/v3.12.x
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:
25-
ref: v3.11.x
26-
erlang_version: 26.0
25+
ref: refs/heads/v3.11.x
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_0
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- erlang_version: "26.0"
15-
elixir_version: "1.14.5"
14+
- erlang_version: "26.1"
15+
elixir_version: "1.15.2"
1616
timeout-minutes: 120
1717
steps:
1818
- name: CHECKOUT REPOSITORY

.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'
@@ -48,8 +48,8 @@ jobs:
4848
backport-v3.12.x
4949
backport-v3.11.x
5050
backport-v3.10.x
51-
- erlang_version: "26.0"
52-
name: '26'
51+
- erlang_version: "26.1"
52+
name: '26_1'
5353
branch: main
5454
labels: |
5555
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(

0 commit comments

Comments
 (0)