From 2d62820b54dd01009ff9a1667433dc6eae89e03d Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Mon, 2 Dec 2024 13:53:55 -0500 Subject: [PATCH 1/2] Bazel: Update bazel/BUILD.horus --- bazel/BUILD.horus | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bazel/BUILD.horus b/bazel/BUILD.horus index e3d75efe9921..0f7e2369acbb 100644 --- a/bazel/BUILD.horus +++ b/bazel/BUILD.horus @@ -24,7 +24,7 @@ erlang_bytecode( srcs = [ "src/horus.erl", "src/horus_cover.erl", - "src/horus_utils.erl", + "src/horus_utils.erl" ], hdrs = [":public_and_private_hdrs"], app_name = "horus", @@ -50,8 +50,9 @@ filegroup( filegroup( name = "private_hdrs", srcs = [ + "src/horus_cover.hrl", "src/horus_error.hrl", - "src/horus_fun.hrl", + "src/horus_fun.hrl" ], ) From 8751a6f4a3d1831d1b06593888603eb09b488ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Wed, 27 Nov 2024 13:33:22 +0100 Subject: [PATCH 2/2] Pin Horus to 0.3.1 temporarily [Why] We pin a version of Horus even if we don't use it directly (it is a dependency of Khepri). But currently, we can't update Khepri while still needing the fix in Horus 0.3.1. Horus 0.3.1 works around a crash in `cover` that mostly affects CI for now. This pinning will have to go away with the next update of Khepri. (cherry picked from commit ae9fbb7bd5982aff099293adbb1edcd616ef806f) --- MODULE.bazel | 4 ++-- deps/rabbit/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4bbb9540afd0..6a0a57e07196 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -189,8 +189,8 @@ erlang_package.hex_package( erlang_package.hex_package( name = "horus", build_file = "@rabbitmq-server//bazel:BUILD.horus", - sha256 = "4ebcb0ce86c8ee411d24b289c504b14431ee004d9f2c48e6f88d4128ded33a2e", - version = "0.2.6", + sha256 = "d564d30ebc274f0d92c3d44a336d0b892f000be159912ae4e6838701e85495ec", + version = "0.3.1", ) erlang_package.hex_package( diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index caae4f48da4b..c5c9f8cb38df 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -128,9 +128,15 @@ endef LOCAL_DEPS = sasl os_mon inets compiler public_key crypto ssl syntax_tools xmerl BUILD_DEPS = rabbitmq_cli -DEPS = ranch rabbit_common amqp10_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris syslog systemd seshat khepri khepri_mnesia_migration cuttlefish gen_batch_server +DEPS = ranch rabbit_common amqp10_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris syslog systemd seshat horus khepri khepri_mnesia_migration cuttlefish gen_batch_server TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers meck proper amqp_client rabbitmq_amqp_client rabbitmq_amqp1_0 +# We pin a version of Horus even if we don't use it directly (it is a +# dependency of Khepri). But currently, we can't update Khepri while still +# needing the fix in Horus 0.3.1. This line and the mention of `horus` above +# should be removed with the next update of Khepri. +dep_horus = hex 0.3.1 + PLT_APPS += mnesia runtime_tools dep_syslog = git https://github.com/schlagert/syslog 4.0.0