Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup bazel/make divergence #9706

Merged
merged 8 commits into from
Oct 16, 2023
Merged

Fixup bazel/make divergence #9706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe07f4c
Always reference seshat 0.6.1
HoloRin Oct 16, 2023
ac1e6cc
Add khepri dep to rabbitmq_consistent_hash_exchange in Make
HoloRin Oct 16, 2023
e4eaf0b
Add khepri to rabbitmq_jms_topic_exchange deps
HoloRin Oct 16, 2023
513e266
Add khepri to rabbitmq_recent_history_exchange deps
HoloRin Oct 16, 2023
3e81015
Remove mnesia from rabbitmq_management_agent deps in bazel
HoloRin Oct 16, 2023
558b8d0
Remove mnesia from rabbitmq_management_agent deps in bazel
HoloRin Oct 16, 2023
8404f0b
Add osiris to rabbitmq_stream_management deps in Make
HoloRin Oct 16, 2023
887f215
Add mnesia to LOCAL_DEPS in rabbitmq_jms_topic_exchange
HoloRin Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions deps/rabbit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))))
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_consistent_hash_exchange/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion deps/rabbitmq_jms_topic_exchange/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions deps/rabbitmq_management/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -75,7 +74,6 @@ rabbitmq_app(
beam_files = [":beam_files"],
extra_apps = [
"crypto",
"mnesia",
"public_key",
"ssl",
],
Expand Down
2 changes: 0 additions & 2 deletions deps/rabbitmq_management_agent/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -62,7 +61,6 @@ rabbitmq_app(
beam_files = [":beam_files"],
extra_apps = [
"crypto",
"mnesia",
"public_key",
"ssl",
"xmerl",
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_recent_history_exchange/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_stream_management/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions rabbitmq-components.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down