Skip to content

Commit de23059

Browse files
committed
Do not use BCR for ra, osiris, or seshat
Because khepri is not bazel-native, ra and seshat needed to be declared twice and manually synchronized. This allows them to be declared just once. looking_glass remains a bazel_dep, since it has native extensions
1 parent 57dcc4b commit de23059

File tree

4 files changed

+149
-27
lines changed

4 files changed

+149
-27
lines changed

MODULE.bazel

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,6 @@ bazel_dep(
4141
repo_name = "looking_glass",
4242
)
4343

44-
bazel_dep(
45-
name = "rabbitmq_osiris",
46-
version = "1.7.2",
47-
repo_name = "osiris",
48-
)
49-
50-
bazel_dep(
51-
name = "rabbitmq_ra",
52-
version = "2.9.1",
53-
repo_name = "ra",
54-
)
55-
56-
bazel_dep(
57-
name = "rabbitmq_seshat",
58-
version = "0.6.1",
59-
repo_name = "seshat",
60-
)
61-
6244
erlang_config = use_extension(
6345
"@rules_erlang//bzlmod:extensions.bzl",
6446
"erlang_config",
@@ -320,6 +302,13 @@ erlang_package.hex_package(
320302
version = "1.7.3",
321303
)
322304

305+
erlang_package.git_package(
306+
name = "osiris",
307+
build_file = "@rabbitmq-server//bazel:BUILD.osiris",
308+
repository = "rabbitmq/osiris",
309+
tag = "v1.7.2",
310+
)
311+
323312
erlang_package.hex_package(
324313
name = "prometheus",
325314
build_file = "@rabbitmq-server//bazel:BUILD.prometheus",
@@ -335,15 +324,15 @@ erlang_package.hex_package(
335324
)
336325

337326
erlang_package.hex_package(
338-
name = "ra_alt",
327+
name = "ra",
339328
build_file = "@rabbitmq-server//bazel:BUILD.ra",
340329
pkg = "ra",
341330
sha256 = "ee7f63461e9b1734e99a7d38cb601803dc0868f015672d795857fa329287288c",
342331
version = "2.9.1",
343332
)
344333

345334
erlang_package.git_package(
346-
name = "seshat_alt",
335+
name = "seshat",
347336
build_file = "@rabbitmq-server//bazel:BUILD.seshat",
348337
repository = "rabbitmq/seshat",
349338
tag = "v0.6.1",
@@ -420,12 +409,13 @@ use_repo(
420409
"khepri",
421410
"khepri_mnesia_migration",
422411
"observer_cli",
412+
"osiris",
423413
"prometheus",
424-
"ra_alt",
414+
"ra",
425415
"ranch",
426416
"recon",
427417
"redbug",
428-
"seshat_alt",
418+
"seshat",
429419
"stdout_formatter",
430420
"syslog",
431421
"sysmon_handler",

bazel/BUILD.khepri

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ erlang_app(
125125
priv = [":priv"],
126126
deps = [
127127
"@horus//:erlang_app",
128-
"@ra_alt//:erlang_app",
129-
"@seshat_alt//:erlang_app",
128+
"@ra//:erlang_app",
129+
"@seshat//:erlang_app",
130130
],
131131
)
132132

@@ -166,8 +166,8 @@ erlang_bytecode(
166166
erlc_opts = "//:erlc_opts",
167167
deps = [
168168
"@horus//:erlang_app",
169-
"@ra_alt//:erlang_app",
170-
"@seshat_alt//:erlang_app",
169+
"@ra//:erlang_app",
170+
"@seshat//:erlang_app",
171171
],
172172
)
173173

bazel/BUILD.osiris

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
load("@rules_erlang//:erlang_bytecode2.bzl", "erlang_bytecode", "erlc_opts")
2+
load("@rules_erlang//:erlang_app.bzl", "erlang_app")
3+
4+
erlc_opts(
5+
name = "erlc_opts",
6+
values = select({
7+
"@rules_erlang//:debug_build": [
8+
"+debug_info",
9+
],
10+
"//conditions:default": [
11+
"+debug_info",
12+
"+deterministic",
13+
],
14+
}),
15+
visibility = [":__subpackages__"],
16+
)
17+
18+
erlang_bytecode(
19+
name = "other_beam",
20+
srcs = [
21+
"src/osiris.erl",
22+
"src/osiris_app.erl",
23+
"src/osiris_bench.erl",
24+
"src/osiris_bloom.erl",
25+
"src/osiris_counters.erl",
26+
"src/osiris_ets.erl",
27+
"src/osiris_log.erl",
28+
"src/osiris_log_shared.erl",
29+
"src/osiris_replica.erl",
30+
"src/osiris_replica_reader.erl",
31+
"src/osiris_replica_reader_sup.erl",
32+
"src/osiris_retention.erl",
33+
"src/osiris_server_sup.erl",
34+
"src/osiris_sup.erl",
35+
"src/osiris_tracking.erl",
36+
"src/osiris_util.erl",
37+
"src/osiris_writer.erl",
38+
],
39+
hdrs = [":public_and_private_hdrs"],
40+
app_name = "osiris",
41+
dest = "ebin",
42+
erlc_opts = "//:erlc_opts",
43+
deps = [
44+
"@gen_batch_server//:erlang_app",
45+
],
46+
)
47+
48+
filegroup(
49+
name = "beam_files",
50+
srcs = [":other_beam"],
51+
)
52+
53+
filegroup(
54+
name = "srcs",
55+
srcs = [
56+
"src/osiris.erl",
57+
"src/osiris_app.erl",
58+
"src/osiris_bench.erl",
59+
"src/osiris_bloom.erl",
60+
"src/osiris_counters.erl",
61+
"src/osiris_ets.erl",
62+
"src/osiris_log.erl",
63+
"src/osiris_log_shared.erl",
64+
"src/osiris_replica.erl",
65+
"src/osiris_replica_reader.erl",
66+
"src/osiris_replica_reader_sup.erl",
67+
"src/osiris_retention.erl",
68+
"src/osiris_server_sup.erl",
69+
"src/osiris_sup.erl",
70+
"src/osiris_tracking.erl",
71+
"src/osiris_util.erl",
72+
"src/osiris_writer.erl",
73+
],
74+
)
75+
76+
filegroup(
77+
name = "private_hdrs",
78+
srcs = [
79+
"src/osiris.hrl",
80+
"src/osiris_peer_shim.hrl",
81+
],
82+
)
83+
84+
filegroup(name = "public_hdrs")
85+
86+
filegroup(name = "priv")
87+
88+
filegroup(
89+
name = "license_files",
90+
srcs = [
91+
"LICENSE",
92+
"LICENSE-APACHE2",
93+
"LICENSE-MPL-RabbitMQ",
94+
],
95+
)
96+
97+
filegroup(
98+
name = "public_and_private_hdrs",
99+
srcs = [
100+
":private_hdrs",
101+
":public_hdrs",
102+
],
103+
)
104+
105+
filegroup(
106+
name = "all_srcs",
107+
srcs = [
108+
":public_and_private_hdrs",
109+
":srcs",
110+
],
111+
)
112+
113+
erlang_app(
114+
name = "erlang_app",
115+
srcs = [":all_srcs"],
116+
hdrs = [":public_hdrs"],
117+
app_name = "osiris",
118+
app_version = "1.7.2",
119+
beam_files = [":beam_files"],
120+
license_files = [":license_files"],
121+
priv = [":priv"],
122+
deps = [
123+
"@gen_batch_server//:erlang_app",
124+
"@seshat//:erlang_app",
125+
],
126+
)
127+
128+
alias(
129+
name = "osiris",
130+
actual = ":erlang_app",
131+
visibility = ["//visibility:public"],
132+
)

bazel/BUILD.ra

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ erlang_app(
188188
deps = [
189189
"@aten//:erlang_app",
190190
"@gen_batch_server//:erlang_app",
191-
"@seshat_alt//:erlang_app",
191+
"@seshat//:erlang_app",
192192
],
193193
)
194194

0 commit comments

Comments
 (0)