diff options
| author | Rin Kuryloski <kuryloskip@vmware.com> | 2023-05-01 10:32:59 +0200 |
|---|---|---|
| committer | Rin Kuryloski <kuryloskip@vmware.com> | 2023-05-15 13:54:14 +0200 |
| commit | eb94a58bc9f4db7a226af26d6f57fdfa24076ed8 (patch) | |
| tree | 7cc1ae03a0b3883dd9454085a5d770e1e9515008 /deps | |
| parent | 1ee8454129b7769fda6dfc1a528e886b290aa258 (diff) | |
| download | rabbitmq-server-git-eb94a58bc9f4db7a226af26d6f57fdfa24076ed8.tar.gz | |
Add a workflow to compare the bazel/erlang.mk output
To catch any drift between the builds
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/amqp10_client/BUILD.bazel | 2 | ||||
| -rw-r--r-- | deps/amqp10_client/Makefile | 2 | ||||
| -rw-r--r-- | deps/amqp10_common/BUILD.bazel | 4 | ||||
| -rw-r--r-- | deps/rabbit/BUILD.bazel | 6 | ||||
| -rw-r--r-- | deps/rabbit/app.bzl | 5 | ||||
| -rw-r--r-- | deps/rabbit_common/Makefile | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_auth_backend_http/BUILD.bazel | 4 | ||||
| -rw-r--r-- | deps/rabbitmq_auth_backend_ldap/Makefile | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_auth_backend_oauth2/Makefile | 1 | ||||
| -rw-r--r-- | deps/rabbitmq_auth_mechanism_ssl/Makefile | 1 | ||||
| -rw-r--r-- | deps/rabbitmq_aws/Makefile | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_federation_management/Makefile | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_jms_topic_exchange/Makefile | 1 | ||||
| -rw-r--r-- | deps/rabbitmq_management/BUILD.bazel | 3 | ||||
| -rw-r--r-- | deps/rabbitmq_mqtt/Makefile | 1 | ||||
| -rw-r--r-- | deps/rabbitmq_prometheus/BUILD.bazel | 1 | ||||
| -rw-r--r-- | deps/rabbitmq_prometheus/Makefile | 3 | ||||
| -rw-r--r-- | deps/rabbitmq_stream/Makefile | 3 | ||||
| -rw-r--r-- | deps/rabbitmq_trust_store/Makefile | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_web_mqtt/Makefile | 1 |
20 files changed, 28 insertions, 20 deletions
diff --git a/deps/amqp10_client/BUILD.bazel b/deps/amqp10_client/BUILD.bazel index 11cef46294..31e961fff0 100644 --- a/deps/amqp10_client/BUILD.bazel +++ b/deps/amqp10_client/BUILD.bazel @@ -28,7 +28,7 @@ APP_EXTRA_KEYS = """%% Hex.pm package informations. {licenses, ["MPL-2.0"]}, {links, [ {"Website", "https://www.rabbitmq.com/"}, - {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_client"} + {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/amqp10_client"} ]}, {build_tools, ["make", "rebar3"]}, {files, [ diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile index 560d96b415..694e6e076b 100644 --- a/deps/amqp10_client/Makefile +++ b/deps/amqp10_client/Makefile @@ -31,7 +31,7 @@ PACKAGES_DIR ?= $(abspath PACKAGES) BUILD_DEPS = rabbit_common elvis_mk DEPS = amqp10_common TEST_DEPS = rabbit rabbitmq_amqp1_0 rabbitmq_ct_helpers -LOCAL_DEPS = ssl inets crypto +LOCAL_DEPS = ssl inets crypto public_key DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \ diff --git a/deps/amqp10_common/BUILD.bazel b/deps/amqp10_common/BUILD.bazel index 09436c8c64..898c539c16 100644 --- a/deps/amqp10_common/BUILD.bazel +++ b/deps/amqp10_common/BUILD.bazel @@ -54,7 +54,7 @@ APP_EXTRA_KEYS = """%% Hex.pm package informations. {licenses, ["MPL-2.0"]}, {links, [ {"Website", "https://www.rabbitmq.com/"}, - {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_common"} + {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/amqp10_common"} ]}, {build_tools, ["make", "rebar3"]}, {files, [ @@ -66,7 +66,7 @@ APP_EXTRA_KEYS = """%% Hex.pm package informations. "rabbitmq-components.mk", "README", "README.md", - "mk" + "src" ]} """ diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index 000e00d7d7..1607890a6b 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -1140,7 +1140,7 @@ genrule( outs = ["manpages.tar"], cmd = """set -euo pipefail -DESTDIR=manpages-tmp/share/man +DESTDIR=share/man mkdir -p $${DESTDIR} for mp in $(SRCS); do section=$${mp##*.} @@ -1148,8 +1148,8 @@ for mp in $(SRCS); do gzip < $$mp \\ > $${DESTDIR}/man$$section/$$(basename $$mp).gz done -tar --strip-components 1 -cf $@ manpages-tmp/* -rm -dr manpages-tmp +tar -cf $@ share +rm -dr share """, visibility = ["//visibility:public"], ) diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl index 950cdd31e8..a6b0ff517d 100644 --- a/deps/rabbit/app.bzl +++ b/deps/rabbit/app.bzl @@ -501,10 +501,7 @@ def all_srcs(name = "all_srcs"): filegroup( name = "priv", - srcs = [ - "priv/schema/.gitignore", - "priv/schema/rabbit.schema", - ], + srcs = ["priv/schema/rabbit.schema"], #keep ) filegroup( name = "private_hdrs", diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile index 7e9802c744..79151b35dc 100644 --- a/deps/rabbit_common/Makefile +++ b/deps/rabbit_common/Makefile @@ -28,7 +28,7 @@ endef LOCAL_DEPS = compiler crypto public_key sasl ssl syntax_tools tools xmerl DEPS = thoas recon credentials_obfuscation -dep_credentials_obfuscation = hex 3.2.0 +dep_credentials_obfuscation = hex 3.4.0 # Variables and recipes in development.*.mk are meant to be used from # any Git clone. They are excluded from the files published to Hex.pm. diff --git a/deps/rabbitmq_auth_backend_http/BUILD.bazel b/deps/rabbitmq_auth_backend_http/BUILD.bazel index c7c101585f..f7fb0a4ede 100644 --- a/deps/rabbitmq_auth_backend_http/BUILD.bazel +++ b/deps/rabbitmq_auth_backend_http/BUILD.bazel @@ -20,7 +20,9 @@ load( ) APP_ENV = """[ - {http_method, get}, + {http_method, get}, + {request_timeout, 15000}, + {connection_timeout, 15000}, {user_path, "http://localhost:8000/auth/user"}, {vhost_path, "http://localhost:8000/auth/vhost"}, {resource_path, "http://localhost:8000/auth/resource"}, diff --git a/deps/rabbitmq_auth_backend_ldap/Makefile b/deps/rabbitmq_auth_backend_ldap/Makefile index 6d97b82a39..2224ea369a 100644 --- a/deps/rabbitmq_auth_backend_ldap/Makefile +++ b/deps/rabbitmq_auth_backend_ldap/Makefile @@ -34,7 +34,7 @@ define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef -LOCAL_DEPS = eldap +LOCAL_DEPS = eldap public_key DEPS = rabbit_common rabbit TEST_DEPS = ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client dep_ct_helper = git https://github.com/extend/ct_helper.git master diff --git a/deps/rabbitmq_auth_backend_oauth2/Makefile b/deps/rabbitmq_auth_backend_oauth2/Makefile index c2bd628d31..b41703c1bf 100644 --- a/deps/rabbitmq_auth_backend_oauth2/Makefile +++ b/deps/rabbitmq_auth_backend_oauth2/Makefile @@ -5,6 +5,7 @@ PROJECT_DESCRIPTION = OAuth 2 and JWT-based AuthN and AuthZ backend BUILD_WITHOUT_QUIC=1 export BUILD_WITHOUT_QUIC +LOCAL_DEPS = inets public_key BUILD_DEPS = rabbit_common DEPS = rabbit cowlib jose base64url TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt diff --git a/deps/rabbitmq_auth_mechanism_ssl/Makefile b/deps/rabbitmq_auth_mechanism_ssl/Makefile index d082725245..9b540fdaf7 100644 --- a/deps/rabbitmq_auth_mechanism_ssl/Makefile +++ b/deps/rabbitmq_auth_mechanism_ssl/Makefile @@ -12,6 +12,7 @@ define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef +LOCAL_DEPS = public_key DEPS = rabbit_common rabbit DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk diff --git a/deps/rabbitmq_aws/Makefile b/deps/rabbitmq_aws/Makefile index 1f55d79882..29089276c9 100644 --- a/deps/rabbitmq_aws/Makefile +++ b/deps/rabbitmq_aws/Makefile @@ -7,7 +7,7 @@ define PROJECT_ENV [] endef -LOCAL_DEPS = crypto inets ssl xmerl +LOCAL_DEPS = crypto inets ssl xmerl public_key BUILD_DEPS = rabbit_common DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk TEST_DEPS = meck diff --git a/deps/rabbitmq_federation_management/Makefile b/deps/rabbitmq_federation_management/Makefile index 5a97cb8318..71ecae0fa5 100644 --- a/deps/rabbitmq_federation_management/Makefile +++ b/deps/rabbitmq_federation_management/Makefile @@ -5,7 +5,7 @@ define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef -DEPS = rabbit_common rabbit rabbitmq_management rabbitmq_federation +DEPS = amqp_client rabbit_common rabbit rabbitmq_management rabbitmq_federation TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers 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 index 7d1dd52bfe..199c42238f 100644 --- a/deps/rabbitmq_jms_topic_exchange/Makefile +++ b/deps/rabbitmq_jms_topic_exchange/Makefile @@ -1,6 +1,7 @@ PROJECT = rabbitmq_jms_topic_exchange PROJECT_DESCRIPTION = RabbitMQ JMS topic selector exchange plugin +LOCAL_DEPS = mnesia DEPS = rabbit_common rabbit TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel index 16e3c6ae78..d837637ad0 100644 --- a/deps/rabbitmq_management/BUILD.bazel +++ b/deps/rabbitmq_management/BUILD.bazel @@ -61,7 +61,7 @@ test_suite_beam_files(name = "test_suite_beam_files") # gazelle:erlang_app_extra_app crypto # gazelle:erlang_app_extra_app public_key -# gazelle:erlang_app_dep_exclude ranch +# gazelle:erlang_app_dep ranch rabbitmq_app( name = "erlang_app", @@ -89,6 +89,7 @@ rabbitmq_app( "//deps/rabbitmq_web_dispatch:erlang_app", "@cowboy//:erlang_app", "@cowlib//:erlang_app", + "@ranch//:erlang_app", ], ) diff --git a/deps/rabbitmq_mqtt/Makefile b/deps/rabbitmq_mqtt/Makefile index 1fe357aa45..97e0ca551e 100644 --- a/deps/rabbitmq_mqtt/Makefile +++ b/deps/rabbitmq_mqtt/Makefile @@ -39,6 +39,7 @@ endef BUILD_WITHOUT_QUIC=1 export BUILD_WITHOUT_QUIC +LOCAL_DEPS = ssl DEPS = ranch rabbit_common rabbit amqp_client ra TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt diff --git a/deps/rabbitmq_prometheus/BUILD.bazel b/deps/rabbitmq_prometheus/BUILD.bazel index cded31e178..d92bc2070e 100644 --- a/deps/rabbitmq_prometheus/BUILD.bazel +++ b/deps/rabbitmq_prometheus/BUILD.bazel @@ -43,6 +43,7 @@ rabbitmq_app( name = "erlang_app", srcs = [":all_srcs"], hdrs = [":public_hdrs"], + app_description = "Prometheus metrics for RabbitMQ", app_env = APP_ENV, app_module = APP_MODULE, app_name = APP_NAME, diff --git a/deps/rabbitmq_prometheus/Makefile b/deps/rabbitmq_prometheus/Makefile index a2b652b12b..8380e81b9a 100644 --- a/deps/rabbitmq_prometheus/Makefile +++ b/deps/rabbitmq_prometheus/Makefile @@ -7,8 +7,9 @@ define PROJECT_ENV endef PROJECT := rabbitmq_prometheus +PROJECT_DESCRIPTION = Prometheus metrics for RabbitMQ PROJECT_MOD := rabbit_prometheus_app -DEPS = accept rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch +DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch BUILD_DEPS = amqp_client rabbit_common rabbitmq_management TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers eunit_formatters diff --git a/deps/rabbitmq_stream/Makefile b/deps/rabbitmq_stream/Makefile index 97002560a3..e63a7ab947 100644 --- a/deps/rabbitmq_stream/Makefile +++ b/deps/rabbitmq_stream/Makefile @@ -21,7 +21,8 @@ define PROJECT_ENV endef -DEPS = rabbit rabbitmq_stream_common +LOCAL_DEPS = ssl +DEPS = rabbit rabbitmq_stream_common osiris ranch 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_trust_store/Makefile b/deps/rabbitmq_trust_store/Makefile index 1e0ddd5aca..77440b7408 100644 --- a/deps/rabbitmq_trust_store/Makefile +++ b/deps/rabbitmq_trust_store/Makefile @@ -10,7 +10,7 @@ define PROJECT_ENV endef DEPS = rabbit_common rabbit -LOCAL_DEPS += ssl crypto public_key +LOCAL_DEPS += ssl crypto public_key inets ## We need the Cowboy's test utilities TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client ct_helper trust_store_http dep_ct_helper = git https://github.com/extend/ct_helper.git master diff --git a/deps/rabbitmq_web_mqtt/Makefile b/deps/rabbitmq_web_mqtt/Makefile index a7eaef0eeb..15819ce13a 100644 --- a/deps/rabbitmq_web_mqtt/Makefile +++ b/deps/rabbitmq_web_mqtt/Makefile @@ -17,6 +17,7 @@ endef BUILD_WITHOUT_QUIC=1 export BUILD_WITHOUT_QUIC +LOCAL_DEPS = ssl DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt TEST_DEPS = emqtt rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management |
