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.

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

Fix bazel make drift #10847

Merged
merged 5 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions bazel/BUILD.cowboy
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ erlang_bytecode(
"src/cowboy_clock.erl",
"src/cowboy_compress_h.erl",
"src/cowboy_constraints.erl",
"src/cowboy_decompress_h.erl",
"src/cowboy_handler.erl",
"src/cowboy_http.erl",
"src/cowboy_http2.erl",
Expand Down Expand Up @@ -94,6 +95,7 @@ filegroup(
"src/cowboy_clock.erl",
"src/cowboy_compress_h.erl",
"src/cowboy_constraints.erl",
"src/cowboy_decompress_h.erl",
"src/cowboy_handler.erl",
"src/cowboy_http.erl",
"src/cowboy_http2.erl",
Expand Down Expand Up @@ -145,10 +147,10 @@ erlang_app(
name = "erlang_app",
srcs = [":all_srcs"],
hdrs = [":public_hdrs"],
app_name = "cowboy",
app_description = "Small, fast, modern HTTP server.",
app_version = "2.10.0",
app_name = "cowboy",
app_registered = ["cowboy_clock"],
app_version = "2.12.0",
beam_files = [":beam_files"],
extra_apps = ["crypto"],
license_files = [":license_files"],
Expand Down
43 changes: 13 additions & 30 deletions bazel/BUILD.cowlib
Original file line number Diff line number Diff line change
Expand Up @@ -39,35 +39,9 @@ erlang_bytecode(
"src/cow_uri_template.erl",
"src/cow_ws.erl",
],
outs = [
"ebin/cow_base64url.beam",
"ebin/cow_cookie.beam",
"ebin/cow_date.beam",
"ebin/cow_hpack.beam",
"ebin/cow_http.beam",
"ebin/cow_http2.beam",
"ebin/cow_http2_machine.beam",
"ebin/cow_http_hd.beam",
"ebin/cow_http_struct_hd.beam",
"ebin/cow_http_te.beam",
"ebin/cow_iolists.beam",
"ebin/cow_link.beam",
"ebin/cow_mimetypes.beam",
"ebin/cow_multipart.beam",
"ebin/cow_qs.beam",
"ebin/cow_spdy.beam",
"ebin/cow_sse.beam",
"ebin/cow_uri.beam",
"ebin/cow_uri_template.beam",
"ebin/cow_ws.beam",
],
hdrs = [
"include/cow_inline.hrl",
"include/cow_parse.hrl",
"src/cow_hpack_dec_huffman_lookup.hrl",
"src/cow_spdy.hrl",
],
hdrs = [":public_and_private_hdrs"],
app_name = "cowlib",
dest = "ebin",
erlc_opts = "//:erlc_opts",
)

Expand Down Expand Up @@ -147,15 +121,24 @@ erlang_app(
name = "erlang_app",
srcs = [":all_srcs"],
hdrs = [":public_hdrs"],
app_name = "cowlib",
app_description = "Support library for manipulating Web protocols.",
app_version = "2.12.1",
app_name = "cowlib",
app_version = "2.13.0",
beam_files = [":beam_files"],
extra_apps = ["crypto"],
license_files = [":license_files"],
priv = [":priv"],
)

alias(
name = "cowlib",
actual = ":erlang_app",
visibility = ["//visibility:public"],
)

filegroup(
name = "license_files",
srcs = [
"LICENSE",
],
)
2 changes: 0 additions & 2 deletions deps/rabbitmq_amqp1_0/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ load("@rules_erlang//:xref2.bzl", "xref")
load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
load(
"//:rabbitmq.bzl",
"BROKER_VERSION_REQUIREMENTS_ANY",
"assert_suites",
"rabbitmq_app",
)
Expand All @@ -29,7 +28,6 @@ rabbitmq_app(
srcs = [":all_srcs"],
hdrs = [":public_hdrs"],
app_description = APP_DESCRIPTION,
app_extra_keys = BROKER_VERSION_REQUIREMENTS_ANY,
app_name = APP_NAME,
beam_files = [":beam_files"],
license_files = [":license_files"],
Expand Down
4 changes: 2 additions & 2 deletions deps/rabbitmq_auth_backend_oauth2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export BUILD_WITHOUT_QUIC

LOCAL_DEPS = inets public_key
BUILD_DEPS = rabbit_common oauth2_client
DEPS = rabbit cowlib jose base64url
TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt oauth2_client
DEPS = rabbit cowlib jose base64url oauth2_client
TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt

DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_prometheus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ endef
PROJECT := rabbitmq_prometheus
PROJECT_DESCRIPTION = Prometheus metrics for RabbitMQ
PROJECT_MOD := rabbit_prometheus_app
DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch
DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch rabbitmq_federation
BUILD_DEPS = amqp_client rabbit_common rabbitmq_management
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers eunit_formatters

Expand Down
1 change: 1 addition & 0 deletions moduleindex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ cowboy:
- cowboy_clock
- cowboy_compress_h
- cowboy_constraints
- cowboy_decompress_h
- cowboy_handler
- cowboy_http
- cowboy_http2
Expand Down
Loading