Merge pull request rabbitmq#9706 from rabbitmq/rin/fix-bazel-make-div…

…ergence Fixup bazel/make divergence
SimonUnge · Oct 16, 2023 · 46a566b · 46a566b
2 parents 2f992a9 + 887f215
commit 46a566b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 14 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -334,12 +334,11 @@ erlang_package.hex_package(
     version = "2.7.0",
 )
 
-erlang_package.hex_package(
+erlang_package.git_package(
     name = "seshat_alt",
     build_file = "@rabbitmq-server//bazel:BUILD.seshat",
-    pkg = "seshat",
-    sha256 = "7cef700f92831dd7cae6a6dd223ccc55ac88ecce0631ee9ab0f2b5fb70e79b90",
-    version = "0.6.0",
+    repository = "rabbitmq/seshat",
+    tag = "v0.6.1",
 )
 
 erlang_package.hex_package(

diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
@@ -152,8 +152,6 @@ dep_osiris = git https://github.com/rabbitmq/osiris v1.6.9
 dep_systemd = hex 0.6.1
 
 dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
-dep_khepri = hex 0.8.0
-dep_khepri_mnesia_migration = hex 0.1.1
 
 define usage_xml_to_erl
 $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1))))

diff --git a/deps/rabbitmq_consistent_hash_exchange/Makefile b/deps/rabbitmq_consistent_hash_exchange/Makefile
@@ -5,7 +5,7 @@ define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
 
-DEPS = rabbit_common rabbit
+DEPS = rabbit_common rabbit khepri khepri_mnesia_migration
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk

diff --git a/deps/rabbitmq_jms_topic_exchange/Makefile b/deps/rabbitmq_jms_topic_exchange/Makefile
@@ -1,8 +1,9 @@
 PROJECT = rabbitmq_jms_topic_exchange
 PROJECT_DESCRIPTION = RabbitMQ JMS topic selector exchange plugin
 
-DEPS = rabbit_common rabbit
+DEPS = rabbit_common rabbit khepri khepri_mnesia_migration
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
+LOCAL_DEPS = mnesia
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel
@@ -56,7 +56,6 @@ all_srcs(name = "all_srcs")
 
 test_suite_beam_files(name = "test_suite_beam_files")
 
-# gazelle:erlang_app_extra_app mnesia
 # gazelle:erlang_app_extra_app ssl
 # gazelle:erlang_app_extra_app crypto
 # gazelle:erlang_app_extra_app public_key
@@ -75,7 +74,6 @@ rabbitmq_app(
     beam_files = [":beam_files"],
     extra_apps = [
         "crypto",
-        "mnesia",
         "public_key",
         "ssl",
     ],

diff --git a/deps/rabbitmq_management_agent/BUILD.bazel b/deps/rabbitmq_management_agent/BUILD.bazel
@@ -43,7 +43,6 @@ all_srcs(name = "all_srcs")
 test_suite_beam_files(name = "test_suite_beam_files")
 
 # gazelle:erlang_app_extra_app xmerl
-# gazelle:erlang_app_extra_app mnesia
 # gazelle:erlang_app_extra_app ssl
 # gazelle:erlang_app_extra_app crypto
 # gazelle:erlang_app_extra_app public_key
@@ -62,7 +61,6 @@ rabbitmq_app(
     beam_files = [":beam_files"],
     extra_apps = [
         "crypto",
-        "mnesia",
         "public_key",
         "ssl",
         "xmerl",

diff --git a/deps/rabbitmq_recent_history_exchange/Makefile b/deps/rabbitmq_recent_history_exchange/Makefile
@@ -5,7 +5,7 @@ define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
 
-DEPS = rabbit_common rabbit
+DEPS = rabbit_common rabbit khepri khepri_mnesia_migration
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk

diff --git a/deps/rabbitmq_stream_management/Makefile b/deps/rabbitmq_stream_management/Makefile
@@ -8,7 +8,7 @@ define PROJECT_ENV
 endef
 
 
-DEPS = rabbit rabbitmq_management rabbitmq_stream
+DEPS = rabbit rabbitmq_management rabbitmq_stream osiris
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk

diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
@@ -114,6 +114,8 @@ dep_accept = hex 0.3.5
 dep_cowboy = hex 2.10.0
 dep_cowlib = hex 2.12.1
 dep_credentials_obfuscation = hex 3.4.0
+dep_khepri = hex 0.8.0
+dep_khepri_mnesia_migration = hex 0.1.1
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
 dep_prometheus = hex 4.10.0
 dep_ra = hex 2.7.0