Skip to content

Commit bf4eabc

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #11120 from rabbitmq/mergify/bp/v3.13.x/pr-11114
Fix make dialyze for a number of plugins (backport #11114)
2 parents 4a6ce9a + 4ca21fe commit bf4eabc

File tree

12 files changed

+25
-0
lines changed

12 files changed

+25
-0
lines changed

‎deps/rabbit_common/mk/rabbitmq-early-test.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ endif
1616

1717
DIALYZER_OPTS ?= -Werror_handling
1818

19+
dialyze: ERL_LIBS := $(ERL_LIBS):$(DEPS_DIR):$(DEPS_DIR)/rabbitmq_cli/_build/dev/lib:$(dir $(shell elixir --eval ":io.format '~s~n', [:code.lib_dir :elixir ]"))
20+
1921
# --------------------------------------------------------------------
2022
# %-on-concourse dependencies.
2123
# --------------------------------------------------------------------

‎deps/rabbitmq_auth_backend_oauth2/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ BUILD_DEPS = rabbit_common oauth2_client
1010
DEPS = rabbit cowlib jose base64url oauth2_client
1111
TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt
1212

13+
PLT_APPS += rabbitmqctl
14+
1315
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
1416
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
1517

‎deps/rabbitmq_consistent_hash_exchange/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ endef
88
DEPS = rabbit_common rabbit khepri khepri_mnesia_migration
99
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
1010

11+
PLT_APPS += mnesia rabbitmqctl
12+
1113
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
1214
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
1315

‎deps/rabbitmq_management_agent/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ endef
2020
DEPS = rabbit_common rabbit rabbitmq_web_dispatch
2121
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
2222
LOCAL_DEPS += xmerl ranch ssl crypto public_key
23+
24+
PLT_APPS += rabbitmqctl
25+
2326
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
2427
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
2528

‎deps/rabbitmq_mqtt/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ LOCAL_DEPS = ssl
4747
DEPS = ranch rabbit_common rabbit ra amqp10_common
4848
TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt amqp_client rabbitmq_consistent_hash_exchange rabbitmq_amqp1_0 amqp10_client rabbitmq_stomp rabbitmq_stream
4949

50+
PLT_APPS += rabbitmqctl elixir
51+
5052
dep_ct_helper = git https://github.com/extend/ct_helper.git master
5153
dep_emqtt = git https://github.com/rabbitmq/emqtt.git master
5254

‎deps/rabbitmq_prelaunch/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ PROJECT_MOD = rabbit_prelaunch_app
66
DEPS = rabbit_common cuttlefish thoas
77
dep_cuttlefish = hex 3.1.0
88

9+
PLT_APPS += runtime_tools eunit osiris systemd
10+
911
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk
1012

1113
include ../../rabbitmq-components.mk

‎deps/rabbitmq_recent_history_exchange/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ endef
88
DEPS = rabbit_common rabbit khepri khepri_mnesia_migration
99
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
1010

11+
PLT_APPS += mnesia
12+
1113
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
1214
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
1315

‎deps/rabbitmq_shovel/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ LOCAL_DEPS = crypto
2525

2626
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_amqp1_0 meck
2727

28+
PLT_APPS += rabbitmqctl
29+
2830
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
2931
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk elvis_mk
3032
dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master

‎deps/rabbitmq_stomp/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ endef
3333
DEPS = ranch rabbit_common rabbit amqp_client
3434
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
3535

36+
PLT_APPS += rabbitmqctl elixir
37+
3638
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
3739
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
3840

‎deps/rabbitmq_stream/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ LOCAL_DEPS = ssl
2525
DEPS = rabbit rabbitmq_stream_common osiris ranch
2626
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
2727

28+
PLT_APPS += rabbitmqctl elixir
29+
2830
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
2931
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
3032

‎deps/rabbitmq_web_mqtt/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ LOCAL_DEPS = ssl
2121
DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt
2222
TEST_DEPS = emqtt rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management
2323

24+
PLT_APPS += rabbitmqctl elixir cowlib
25+
2426
# FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked.
2527
# See rabbitmq-components.mk.
2628
BUILD_DEPS += ranch

‎deps/rabbitmq_web_stomp/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ endef
2222
DEPS = cowboy rabbit_common rabbit rabbitmq_stomp
2323
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
2424

25+
PLT_APPS += cowlib
26+
2527
# FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked.
2628
# See rabbitmq-components.mk.
2729
BUILD_DEPS += ranch

0 commit comments

Comments
 (0)