summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <klishinm@vmware.com>2023-05-17 21:52:21 +0400
committerGitHub <noreply@github.com>2023-05-17 21:52:21 +0400
commitbe7a159ae97a0370f241fd2a8d637c1fb012b8b3 (patch)
treefb1339580f8698f2bec01e777e0ec9a7bf5919f6
parent8d4373f91d2f3b57ff2201bcc25668c0b4af9566 (diff)
parent0303d2dfe34e1c5d80d846b8baa017d69332bb95 (diff)
downloadrabbitmq-server-git-v3.12.x.tar.gz
Merge pull request #8230 from rabbitmq/mergify/bp/v3.12.x/pr-8224v3.12.x
Use erlang 26.0 instead of rc3 in bazel (backport #8224)
-rw-r--r--.github/workflows/update-otp-patches.yaml7
-rw-r--r--MODULE.bazel4
2 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/update-otp-patches.yaml b/.github/workflows/update-otp-patches.yaml
index 0a20080e88..cc0a3d25b0 100644
--- a/.github/workflows/update-otp-patches.yaml
+++ b/.github/workflows/update-otp-patches.yaml
@@ -17,6 +17,7 @@ jobs:
- "25.1"
- "25.2"
- "25.3"
+ - "26.0"
include:
- erlang_version: "24.3"
name: '24'
@@ -47,6 +48,12 @@ jobs:
backport-v3.12.x
backport-v3.11.x
backport-v3.10.x
+ - erlang_version: "26.0"
+ name: '26'
+ branch: main
+ labels: |
+ backport-v3.12.x
+ backport-v3.11.x
timeout-minutes: 10
env:
branch: bump-otp-${{ matrix.erlang_version }}
diff --git a/MODULE.bazel b/MODULE.bazel
index 8c1035976d..21e8eb8639 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -71,8 +71,8 @@ erlang_config.internal_erlang_from_github_release(
erlang_config.internal_erlang_from_github_release(
name = "26",
- sha256 = "ce962175c4d90161a7247d8e2e4ae36f9d8cc0214c8f52dba8ba84a82afc096f",
- version = "26.0-rc3",
+ sha256 = "3ff3c53d7ef9a45b5720e95b8756269c1a1b58eb51accc992ca97522fdb234d4",
+ version = "26.0",
)
erlang_config.internal_erlang_from_http_archive(