Skip to content

Commit f3e683f

Browse files
HoloRinHoloRin
authored
Merge pull request #4663 from rabbitmq/mergify/bp/v3.10.x/pr-4662
Add a MODULE.bazel file and enable bzlmod (backport #4662)
2 parents 3671a8e + 765047f commit f3e683f

File tree

7 files changed

+288
-6
lines changed

7 files changed

+288
-6
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
build --experimental_enable_bzlmod
2+
13
build --incompatible_strict_action_env
24
build --local_test_jobs=1
35

‎.github/workflows/test-windows.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
run: |
3333
ERL_PATH="$(which erl)"
3434
IEX_PATH="$(which iex)"
35+
sed -i"_orig" 's/build --experimental_enable_bzlmod//' .bazelrc
3536
cat << EOF >> user.bazelrc
3637
startup --output_user_root=C:/tmp
3738
startup --windows_enable_symlinks

‎MODULE.bazel‎

Lines changed: 267 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,267 @@
1+
module(
2+
name = "rabbitmq-server",
3+
version = "3.10.0",
4+
)
5+
6+
bazel_dep(name = "rules_erlang", version = "2.5.2")
7+
8+
erlang_package = use_extension(
9+
"@rules_erlang//bzlmod:extensions.bzl",
10+
"erlang_package",
11+
)
12+
13+
erlang_package.hex(
14+
name = "accept",
15+
version = "0.3.5",
16+
sha256 = "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8",
17+
)
18+
19+
erlang_package.hex(
20+
name = "aten",
21+
version = "0.5.7",
22+
sha256 = "8b623c8be27b59a911d16ab0af41777b504c147bc0d60a29015fab58321c04b0",
23+
)
24+
25+
erlang_package.hex(
26+
name = "base64url",
27+
version = "1.0.1",
28+
sha256 = "f9b3add4731a02a9b0410398b475b33e7566a695365237a6bdee1bb447719f5c",
29+
)
30+
31+
erlang_package.hex(
32+
name = "cowboy",
33+
version = "2.8.0",
34+
sha256 = "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a",
35+
)
36+
37+
erlang_package.hex(
38+
name = "cowlib",
39+
version = "2.9.1",
40+
sha256 = "e4175dc240a70d996156160891e1c62238ede1729e45740bdd38064dad476170",
41+
)
42+
43+
erlang_package.git(
44+
name = "credentials_obfuscation",
45+
repository = "rabbitmq/credentials-obfuscation",
46+
tag = "v2.4.0",
47+
)
48+
49+
erlang_package.git(
50+
repository = "extend/ct_helper",
51+
branch = "master",
52+
)
53+
54+
erlang_package.hex(
55+
name = "cuttlefish",
56+
version = "3.0.1",
57+
sha256 = "3feff3ae4ed1f0ca6df87ac89235068fbee9242ee85d2ac17fb1b8ce0e30f1a6",
58+
)
59+
60+
erlang_package.hex(
61+
name = "eetcd",
62+
version = "0.3.5",
63+
sha256 = "af9d5158ad03a6794d412708d605be5dd1ebd0b8a1271786530d99f165bb0cff",
64+
build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app")
65+
66+
erlang_app(
67+
app_name = "eetcd",
68+
erlc_opts = [
69+
"+deterministic",
70+
"+debug_info",
71+
],
72+
runtime_deps = [
73+
"@gun//:erlang_app",
74+
],
75+
)
76+
""",
77+
)
78+
79+
erlang_package.git(
80+
repository = "rabbitmq/emqttc",
81+
branch = "remove-logging",
82+
)
83+
84+
erlang_package.hex(
85+
name = "enough",
86+
version = "0.1.0",
87+
sha256 = "0460c7abda5f5e0ea592b12bc6976b8a5c4b96e42f332059cd396525374bf9a1",
88+
)
89+
90+
erlang_package.hex(
91+
name = "gen_batch_server",
92+
version = "0.8.7",
93+
sha256 = "94a49a528486298b009d2a1b452132c0a0d68b3e89d17d3764cb1ec879b7557a",
94+
)
95+
96+
erlang_package.hex(
97+
name = "gun",
98+
version = "1.3.3",
99+
sha256 = "3106ce167f9c9723f849e4fb54ea4a4d814e3996ae243a1c828b256e749041e0",
100+
)
101+
102+
erlang_package.git(
103+
name = "inet_tcp_proxy_dist",
104+
repository = "rabbitmq/inet_tcp_proxy",
105+
branch = "master",
106+
)
107+
108+
erlang_package.git(
109+
name = "jose",
110+
repository = "potatosalad/erlang-jose",
111+
commit = "2b1d66b5f4fbe33cb198149a8cb23895a2c877ea",
112+
)
113+
114+
erlang_package.hex(
115+
name = "jsx",
116+
version = "3.1.0",
117+
sha256 = "0c5cc8fdc11b53cc25cf65ac6705ad39e54ecc56d1c22e4adb8f5a53fb9427f3",
118+
)
119+
120+
erlang_package.git(
121+
repository = "eproxus/meck",
122+
branch = "master",
123+
)
124+
125+
erlang_package.hex(
126+
name = "observer_cli",
127+
version = "1.7.3",
128+
sha256 = "a41b6d3e11a3444e063e09cc225f7f3e631ce14019e5fbcaebfda89b1bd788ea",
129+
)
130+
131+
erlang_package.git(
132+
repository = "rabbitmq/osiris",
133+
tag = "v1.2.6",
134+
)
135+
136+
erlang_package.hex(
137+
name = "prometheus",
138+
version = "4.8.2",
139+
sha256 = "c3abd6521e52cec4f0d8eca603cf214dfc84d8a27aa85946639f1424b8554d98",
140+
build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app")
141+
142+
erlang_app(
143+
app_name = "prometheus",
144+
erlc_opts = [
145+
"+deterministic",
146+
"+debug_info",
147+
],
148+
deps = [
149+
"@quantile_estimator//:erlang_app",
150+
],
151+
)
152+
""",
153+
)
154+
155+
erlang_package.git(
156+
repository = "manopapad/proper",
157+
branch = "master",
158+
)
159+
160+
erlang_package.hex(
161+
name = "quantile_estimator",
162+
version = "0.2.1",
163+
sha256 = "282a8a323ca2a845c9e6f787d166348f776c1d4a41ede63046d72d422e3da946",
164+
)
165+
166+
erlang_package.hex(
167+
name = "ra",
168+
version = "2.0.9",
169+
sha256 = "c00bbefe56b7eee6036430f97463a7f500cdab2a72c9b8229ee6ade6a3c22803",
170+
)
171+
172+
erlang_package.hex(
173+
name = "ranch",
174+
version = "2.1.0",
175+
sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916",
176+
)
177+
178+
erlang_package.hex(
179+
name = "recon",
180+
version = "2.5.2",
181+
sha256 = "2c7523c8dee91dff41f6b3d63cba2bd49eb6d2fe5bf1eec0df7f87eb5e230e1c",
182+
)
183+
184+
erlang_package.hex(
185+
name = "redbug",
186+
version = "2.0.7",
187+
sha256 = "3624feb7a4b78fd9ae0e66cc3158fe7422770ad6987a1ebf8df4d3303b1c4b0c",
188+
)
189+
190+
erlang_package.git(
191+
repository = "rabbitmq/seshat",
192+
tag = "0.1.0",
193+
)
194+
195+
erlang_package.hex(
196+
name = "stdout_formatter",
197+
version = "0.2.4",
198+
sha256 = "51f1df921b0477275ea712763042155dbc74acc75d9648dbd54985c45c913b29",
199+
)
200+
201+
erlang_package.git(
202+
repository = "schlagert/syslog",
203+
tag = "4.0.0",
204+
)
205+
206+
erlang_package.hex(
207+
name = "sysmon_handler",
208+
version = "1.3.0",
209+
sha256 = "922cf0dd558b9fdb1326168373315b52ed6a790ba943f6dcbd9ee22a74cebdef",
210+
)
211+
212+
erlang_package.hex(
213+
name = "systemd",
214+
version = "0.6.1",
215+
sha256 = "8ec5ed610a5507071cdb7423e663e2452a747a624bb8a58582acd9491ccad233",
216+
build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app")
217+
218+
erlang_app(
219+
app_name = "systemd",
220+
erlc_opts = [
221+
"+deterministic",
222+
"+debug_info",
223+
],
224+
deps = [
225+
"@enough//:erlang_app",
226+
],
227+
)
228+
""",
229+
)
230+
231+
erlang_package.git(
232+
name = "trust_store_http",
233+
repository = "rabbitmq/trust-store-http",
234+
branch = "master",
235+
)
236+
237+
use_repo(
238+
erlang_package,
239+
"accept",
240+
"aten",
241+
"base64url",
242+
"cowboy",
243+
"cowlib",
244+
"credentials_obfuscation",
245+
"ct_helper",
246+
"cuttlefish",
247+
"eetcd",
248+
"emqttc",
249+
"gen_batch_server",
250+
"gun",
251+
"inet_tcp_proxy_dist",
252+
"jose",
253+
"jsx",
254+
"meck",
255+
"observer_cli",
256+
"prometheus",
257+
"proper",
258+
"ranch",
259+
"recon",
260+
"redbug",
261+
"seshat",
262+
"stdout_formatter",
263+
"syslog",
264+
"sysmon_handler",
265+
"systemd",
266+
"trust_store_http",
267+
)

‎WORKSPACE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pkg_zip(
8585
name = "inet_tcp_proxy_ez",
8686
package_dir = "inet_tcp_proxy/ebin",
8787
srcs = [
88-
"@inet_tcp_proxy//:erlang_app",
88+
"@rules_erlang.2.5.2.erlang_package.inet_tcp_proxy_dist//:erlang_app",
8989
],
9090
package_file_name = "inet_tcp_proxy-0.1.0.ez",
9191
visibility = ["//visibility:public"],

‎deps/rabbit/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ rabbitmq_home(
241241
plugins = [
242242
":test_erlang_app",
243243
"//deps/rabbitmq_ct_client_helpers:erlang_app",
244-
"@inet_tcp_proxy//:erlang_app",
244+
"@inet_tcp_proxy_dist//:erlang_app",
245245
"@meck//:erlang_app",
246246
],
247247
)

‎deps/rabbit_common/BUILD.bazel‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ app_file(
113113

114114
erlc(
115115
name = "beam_files",
116-
srcs = glob(["src/*.erl"]) + [
116+
srcs = glob(
117+
["src/*.erl"],
118+
) + [
117119
"src/rabbit_framing_amqp_0_8.erl",
118120
"src/rabbit_framing_amqp_0_9_1.erl",
119121
],
@@ -128,15 +130,19 @@ erlang_app_info(
128130
hdrs = HDRS,
129131
app = ":app_file",
130132
app_name = APP_NAME,
131-
beam = [":beam_files"],
133+
beam = [
134+
":beam_files",
135+
],
132136
visibility = ["//visibility:public"],
133137
deps = DEPS + RUNTIME_DEPS,
134138
)
135139

136140
erlc(
137141
name = "test_beam_files",
138142
testonly = True,
139-
srcs = glob(["src/*.erl"]) + [
143+
srcs = glob(
144+
["src/*.erl"],
145+
) + [
140146
"src/rabbit_framing_amqp_0_8.erl",
141147
"src/rabbit_framing_amqp_0_9_1.erl",
142148
],
@@ -152,7 +158,9 @@ erlang_app_info(
152158
hdrs = HDRS,
153159
app = ":app_file",
154160
app_name = APP_NAME,
155-
beam = [":test_beam_files"],
161+
beam = [
162+
":test_beam_files",
163+
],
156164
visibility = ["//:__subpackages__"],
157165
deps = DEPS + RUNTIME_DEPS,
158166
)

‎workspace_helpers.bzl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ erlang_app(
162162
version = "1.2.6",
163163
sha256 = "abfe9bc53b0eb1c14713152314f612562ecb76465b9f804313e3510b73e5720b",
164164
build_file = rabbitmq_workspace + "//:BUILD.osiris",
165+
repo_mapping = {
166+
"@gen_batch_server": "@rules_erlang.2.5.2.erlang_package.gen_batch_server",
167+
"@seshat": "@rules_erlang.2.5.2.erlang_package.seshat",
168+
},
165169
)
166170

167171
hex_pm_erlang_app(

0 commit comments

Comments
 (0)