Skip to content

Commit f2c70d7

Browse files
HoloRinHoloRin
authored
Merge pull request #7983 from rabbitmq/mergify/bp/v3.12.x/pr-7982
Use rules erlang 3.9.14 (backport #7982)
2 parents f18df0d + d1e1084 commit f2c70d7

File tree

51 files changed

+2735
-636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2735
-636
lines changed

‎BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ exports_files([
5656
# gazelle:exclude deps/prometheus
5757
# gazelle:exclude deps/quantile_estimator
5858
# gazelle:exclude deps/ra
59-
# gazelle:exclude deps/rabbitmq_cli
6059
# gazelle:exclude deps/ranch
6160
# gazelle:exclude deps/recon
6261
# gazelle:exclude deps/redbug

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bazel_dep(
3131

3232
bazel_dep(
3333
name = "rules_erlang",
34-
version = "3.9.13",
34+
version = "3.9.14",
3535
)
3636

3737
erlang_config = use_extension(

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
66
git_repository(
77
name = "rules_erlang",
88
remote = "https://github.com/rabbitmq/rules_erlang.git",
9-
tag = "3.9.13",
9+
tag = "3.9.14",
1010
)
1111

1212
load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")

‎deps/amqp10_client/app.bzl‎

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ def all_beam_files(name = "all_beam_files"):
88
)
99
erlang_bytecode(
1010
name = "other_beam",
11-
srcs = native.glob(["src/**/*.erl"]),
11+
srcs = [
12+
"src/amqp10_client.erl",
13+
"src/amqp10_client_app.erl",
14+
"src/amqp10_client_connection.erl",
15+
"src/amqp10_client_connection_sup.erl",
16+
"src/amqp10_client_connections_sup.erl",
17+
"src/amqp10_client_frame_reader.erl",
18+
"src/amqp10_client_session.erl",
19+
"src/amqp10_client_sessions_sup.erl",
20+
"src/amqp10_client_sup.erl",
21+
"src/amqp10_client_types.erl",
22+
"src/amqp10_msg.erl",
23+
],
1224
hdrs = [":public_and_private_hdrs"],
1325
app_name = "amqp10_client",
1426
dest = "ebin",
@@ -25,7 +37,19 @@ def all_test_beam_files(name = "all_test_beam_files"):
2537
erlang_bytecode(
2638
name = "test_other_beam",
2739
testonly = True,
28-
srcs = native.glob(["src/**/*.erl"]),
40+
srcs = [
41+
"src/amqp10_client.erl",
42+
"src/amqp10_client_app.erl",
43+
"src/amqp10_client_connection.erl",
44+
"src/amqp10_client_connection_sup.erl",
45+
"src/amqp10_client_connections_sup.erl",
46+
"src/amqp10_client_frame_reader.erl",
47+
"src/amqp10_client_session.erl",
48+
"src/amqp10_client_sessions_sup.erl",
49+
"src/amqp10_client_sup.erl",
50+
"src/amqp10_client_types.erl",
51+
"src/amqp10_msg.erl",
52+
],
2953
hdrs = [":public_and_private_hdrs"],
3054
app_name = "amqp10_client",
3155
dest = "test",
@@ -44,27 +68,37 @@ def all_srcs(name = "all_srcs"):
4468
)
4569
filegroup(
4670
name = "priv",
47-
srcs = native.glob(["priv/**/*"]),
4871
)
4972

5073
filegroup(
5174
name = "srcs",
52-
srcs = native.glob([
53-
"src/**/*.app.src",
54-
"src/**/*.erl",
55-
]),
75+
srcs = [
76+
"src/amqp10_client.erl",
77+
"src/amqp10_client_app.erl",
78+
"src/amqp10_client_connection.erl",
79+
"src/amqp10_client_connection_sup.erl",
80+
"src/amqp10_client_connections_sup.erl",
81+
"src/amqp10_client_frame_reader.erl",
82+
"src/amqp10_client_session.erl",
83+
"src/amqp10_client_sessions_sup.erl",
84+
"src/amqp10_client_sup.erl",
85+
"src/amqp10_client_types.erl",
86+
"src/amqp10_msg.erl",
87+
],
5688
)
5789
filegroup(
5890
name = "private_hdrs",
59-
srcs = native.glob(["src/**/*.hrl"]),
91+
srcs = ["src/amqp10_client.hrl"],
6092
)
6193
filegroup(
6294
name = "public_hdrs",
63-
srcs = native.glob(["include/**/*.hrl"]),
6495
)
6596
filegroup(
6697
name = "license_files",
67-
srcs = native.glob(["LICENSE*"]),
98+
srcs = [
99+
"LICENSE",
100+
"LICENSE-MPL-RabbitMQ",
101+
],
68102
)
69103

70104
def test_suite_beam_files(name = "test_suite_beam_files"):

‎deps/amqp10_common/app.bzl‎

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ def all_beam_files(name = "all_beam_files"):
99
erlang_bytecode(
1010
name = "other_beam",
1111
srcs = [
12+
"src/amqp10_binary_generator.erl",
13+
"src/amqp10_binary_parser.erl",
14+
"src/amqp10_framing.erl",
1215
"src/amqp10_framing0.erl",
13-
] + native.glob(
14-
["src/**/*.erl"],
15-
exclude = [
16-
"src/amqp10_framing0.erl", # keep
17-
],
18-
),
16+
],
1917
hdrs = [":public_and_private_hdrs"],
2018
app_name = "amqp10_common",
2119
dest = "ebin",
@@ -32,13 +30,11 @@ def all_test_beam_files(name = "all_test_beam_files"):
3230
name = "test_other_beam",
3331
testonly = True,
3432
srcs = [
33+
"src/amqp10_binary_generator.erl",
34+
"src/amqp10_binary_parser.erl",
35+
"src/amqp10_framing.erl",
3536
"src/amqp10_framing0.erl",
36-
] + native.glob(
37-
["src/**/*.erl"],
38-
exclude = [
39-
"src/amqp10_framing0.erl", # keep
40-
],
41-
),
37+
],
4238
hdrs = [":public_and_private_hdrs"],
4339
app_name = "amqp10_common",
4440
dest = "test",
@@ -57,38 +53,30 @@ def all_srcs(name = "all_srcs"):
5753

5854
filegroup(
5955
name = "priv",
60-
srcs = native.glob(["priv/**/*"]),
6156
)
6257

6358
filegroup(
6459
name = "srcs",
6560
srcs = [
61+
"src/amqp10_binary_generator.erl",
62+
"src/amqp10_binary_parser.erl",
63+
"src/amqp10_framing.erl",
6664
"src/amqp10_framing0.erl",
67-
] + native.glob([
68-
"src/**/*.app.src",
69-
"src/**/*.erl",
70-
], exclude = [
71-
"src/amqp10_framing0.erl", # keep
72-
]),
65+
],
7366
)
7467
filegroup(
7568
name = "public_hdrs",
76-
srcs = [
77-
"include/amqp10_framing.hrl",
78-
] + native.glob(
79-
["include/**/*.hrl"],
80-
exclude = [
81-
"include/amqp10_framing.hrl", # keep
82-
],
83-
),
69+
srcs = ["include/amqp10_framing.hrl"],
8470
)
8571
filegroup(
8672
name = "private_hdrs",
87-
srcs = native.glob(["src/**/*.hrl"]),
8873
)
8974
filegroup(
9075
name = "license_files",
91-
srcs = native.glob(["LICENSE*"]),
76+
srcs = [
77+
"LICENSE",
78+
"LICENSE-MPL-RabbitMQ",
79+
],
9280
)
9381

9482
def test_suite_beam_files(name = "test_suite_beam_files"):

‎deps/amqp_client/app.bzl‎

Lines changed: 84 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,30 @@ def all_beam_files(name = "all_beam_files"):
2020
)
2121
erlang_bytecode(
2222
name = "other_beam",
23-
srcs = native.glob(
24-
["src/**/*.erl"],
25-
exclude = [
26-
"src/amqp_gen_connection.erl",
27-
"src/amqp_gen_consumer.erl",
28-
],
29-
),
23+
srcs = [
24+
"src/amqp_auth_mechanisms.erl",
25+
"src/amqp_channel.erl",
26+
"src/amqp_channel_sup.erl",
27+
"src/amqp_channel_sup_sup.erl",
28+
"src/amqp_channels_manager.erl",
29+
"src/amqp_client.erl",
30+
"src/amqp_connection.erl",
31+
"src/amqp_connection_sup.erl",
32+
"src/amqp_connection_type_sup.erl",
33+
"src/amqp_direct_connection.erl",
34+
"src/amqp_direct_consumer.erl",
35+
"src/amqp_main_reader.erl",
36+
"src/amqp_network_connection.erl",
37+
"src/amqp_rpc_client.erl",
38+
"src/amqp_rpc_server.erl",
39+
"src/amqp_selective_consumer.erl",
40+
"src/amqp_ssl.erl",
41+
"src/amqp_sup.erl",
42+
"src/amqp_uri.erl",
43+
"src/amqp_util.erl",
44+
"src/rabbit_routing_util.erl",
45+
"src/uri_parser.erl",
46+
],
3047
hdrs = [":public_and_private_hdrs"],
3148
app_name = "amqp_client",
3249
beam = [":behaviours"],
@@ -57,13 +74,30 @@ def all_test_beam_files(name = "all_test_beam_files"):
5774
erlang_bytecode(
5875
name = "test_other_beam",
5976
testonly = True,
60-
srcs = native.glob(
61-
["src/**/*.erl"],
62-
exclude = [
63-
"src/amqp_gen_connection.erl",
64-
"src/amqp_gen_consumer.erl",
65-
],
66-
),
77+
srcs = [
78+
"src/amqp_auth_mechanisms.erl",
79+
"src/amqp_channel.erl",
80+
"src/amqp_channel_sup.erl",
81+
"src/amqp_channel_sup_sup.erl",
82+
"src/amqp_channels_manager.erl",
83+
"src/amqp_client.erl",
84+
"src/amqp_connection.erl",
85+
"src/amqp_connection_sup.erl",
86+
"src/amqp_connection_type_sup.erl",
87+
"src/amqp_direct_connection.erl",
88+
"src/amqp_direct_consumer.erl",
89+
"src/amqp_main_reader.erl",
90+
"src/amqp_network_connection.erl",
91+
"src/amqp_rpc_client.erl",
92+
"src/amqp_rpc_server.erl",
93+
"src/amqp_selective_consumer.erl",
94+
"src/amqp_ssl.erl",
95+
"src/amqp_sup.erl",
96+
"src/amqp_uri.erl",
97+
"src/amqp_util.erl",
98+
"src/rabbit_routing_util.erl",
99+
"src/uri_parser.erl",
100+
],
67101
hdrs = [":public_and_private_hdrs"],
68102
app_name = "amqp_client",
69103
beam = [":test_behaviours"],
@@ -84,27 +118,55 @@ def all_srcs(name = "all_srcs"):
84118

85119
filegroup(
86120
name = "priv",
87-
srcs = native.glob(["priv/**/*"]),
88121
)
89122

90123
filegroup(
91124
name = "srcs",
92-
srcs = native.glob([
93-
"src/**/*.app.src",
94-
"src/**/*.erl",
95-
]),
125+
srcs = [
126+
"src/amqp_auth_mechanisms.erl",
127+
"src/amqp_channel.erl",
128+
"src/amqp_channel_sup.erl",
129+
"src/amqp_channel_sup_sup.erl",
130+
"src/amqp_channels_manager.erl",
131+
"src/amqp_client.erl",
132+
"src/amqp_connection.erl",
133+
"src/amqp_connection_sup.erl",
134+
"src/amqp_connection_type_sup.erl",
135+
"src/amqp_direct_connection.erl",
136+
"src/amqp_direct_consumer.erl",
137+
"src/amqp_gen_connection.erl",
138+
"src/amqp_gen_consumer.erl",
139+
"src/amqp_main_reader.erl",
140+
"src/amqp_network_connection.erl",
141+
"src/amqp_rpc_client.erl",
142+
"src/amqp_rpc_server.erl",
143+
"src/amqp_selective_consumer.erl",
144+
"src/amqp_ssl.erl",
145+
"src/amqp_sup.erl",
146+
"src/amqp_uri.erl",
147+
"src/amqp_util.erl",
148+
"src/rabbit_routing_util.erl",
149+
"src/uri_parser.erl",
150+
],
96151
)
97152
filegroup(
98153
name = "public_hdrs",
99-
srcs = native.glob(["include/**/*.hrl"]),
154+
srcs = [
155+
"include/amqp_client.hrl",
156+
"include/amqp_client_internal.hrl",
157+
"include/amqp_gen_consumer_spec.hrl",
158+
"include/rabbit_routing_prefixes.hrl",
159+
],
100160
)
101161
filegroup(
102162
name = "private_hdrs",
103-
srcs = native.glob(["src/**/*.hrl"]),
104163
)
105164
filegroup(
106165
name = "license_files",
107-
srcs = native.glob(["LICENSE*"]),
166+
srcs = [
167+
"LICENSE",
168+
"LICENSE-MPL-RabbitMQ",
169+
],
108170
)
109171

110172
def test_suite_beam_files(name = "test_suite_beam_files"):

0 commit comments

Comments
 (0)