diff options
| author | Michael Davis <mcarsondavis@gmail.com> | 2022-11-07 18:39:46 -0600 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2022-11-08 06:59:02 +0000 |
| commit | 257f9579244b14a1a4a0d7e88ee71db15c4b0c06 (patch) | |
| tree | 5bbe6474a2f39f71248b6599a476cc873be6549f | |
| parent | 20f309e6846c729b8cb5a97475c14f879d8f5369 (diff) | |
| download | rabbitmq-server-git-257f9579244b14a1a4a0d7e88ee71db15c4b0c06.tar.gz | |
Bump Ra to 2.4.1
(cherry picked from commit 24297f5e5963fd225d6244135901371d891a3a26)
# Conflicts:
# MODULE.bazel
# rabbitmq-components.mk
# workspace_helpers.bzl
| -rw-r--r-- | MODULE.bazel | 4 | ||||
| -rw-r--r-- | rabbitmq-components.mk | 4 | ||||
| -rw-r--r-- | workspace_helpers.bzl | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/MODULE.bazel b/MODULE.bazel index 8f59dc22c1..ba0197b5f2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -281,7 +281,11 @@ erlang_package.hex_package( erlang_package.git_package( repository = "rabbitmq/ra", +<<<<<<< HEAD tag = "v2.4.0", +======= + tag = "v2.4.1", +>>>>>>> 24297f5e59 (Bump Ra to 2.4.1) patch_cmds = ["""sed -i"_orig" -E 's/erlc/erlang_bytecode/g' ra.bzl """], build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app") diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 67a7b15ea2..cb4e2203ff 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -115,7 +115,11 @@ dep_cowboy = hex 2.8.0 dep_cowlib = hex 2.9.1 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git master dep_prometheus = hex 4.9.1 +<<<<<<< HEAD dep_ra = hex 2.4.0 +======= +dep_ra = hex 2.4.1 +>>>>>>> 24297f5e59 (Bump Ra to 2.4.1) dep_ranch = hex 2.1.0 dep_recon = hex 2.5.2 dep_redbug = hex 2.0.7 diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl index a2fe391353..17e2473f7d 100644 --- a/workspace_helpers.bzl +++ b/workspace_helpers.bzl @@ -174,8 +174,13 @@ sed -i"_orig" -E '/VERSION/ s/[0-9]+\\.[0-9]+\\.[0-9]+/'${VERSION}'/' BUILD.baze hex_pm_erlang_app( name = "ra", +<<<<<<< HEAD version = "2.4.0", sha256 = "f716146ee1755823fbff741669053efc76e241caa95465782fc4c0a4389eb40c", +======= + version = "2.4.1", + sha256 = "b4e7ff475d63d27bb1e544bd43200ce110079c078f8e7d0ac87565262482be52", +>>>>>>> 24297f5e59 (Bump Ra to 2.4.1) deps = [ "@gen_batch_server//:erlang_app", ], |