Skip to content

Commit 657a5b7

Browse files
Merge pull request #10584 from rabbitmq/rin/only-rules_erlang-from-bcr
only rules_erlang, looking_glass & osiris from BCR
2 parents 9784ba6 + 5dc6df2 commit 657a5b7

File tree

6 files changed

+74
-248
lines changed

6 files changed

+74
-248
lines changed

BAZEL.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ Note: This takes quite some time on a single machine.
8787

8888
`bazel run gazelle`
8989

90+
## Regenerate moduleindex.yaml
91+
92+
`bazel run :moduleindex > moduleindex.yaml`
93+
9094
## Additional Useful Commands
9195

9296
- Format all bazel files consistently (requires [buildifier](https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md)):

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ moduleindex(
291291
"@ct_helper//:erlang_app",
292292
"@emqtt//:erlang_app",
293293
"@inet_tcp_proxy_dist//:erlang_app",
294+
"@looking_glass//:erlang_app",
294295
"@meck//:erlang_app",
295296
"@proper//:erlang_app",
296297
"//deps/rabbitmq_ct_client_helpers:erlang_app",

MODULE.bazel

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,6 @@ bazel_dep(
4747
repo_name = "osiris",
4848
)
4949

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-
6250
erlang_config = use_extension(
6351
"@rules_erlang//bzlmod:extensions.bzl",
6452
"erlang_config",
@@ -335,15 +323,15 @@ erlang_package.hex_package(
335323
)
336324

337325
erlang_package.hex_package(
338-
name = "ra_alt",
326+
name = "ra",
339327
build_file = "@rabbitmq-server//bazel:BUILD.ra",
340328
pkg = "ra",
341329
sha256 = "ee7f63461e9b1734e99a7d38cb601803dc0868f015672d795857fa329287288c",
342330
version = "2.9.1",
343331
)
344332

345333
erlang_package.git_package(
346-
name = "seshat_alt",
334+
name = "seshat",
347335
build_file = "@rabbitmq-server//bazel:BUILD.seshat",
348336
repository = "rabbitmq/seshat",
349337
tag = "v0.6.1",
@@ -421,11 +409,11 @@ use_repo(
421409
"khepri_mnesia_migration",
422410
"observer_cli",
423411
"prometheus",
424-
"ra_alt",
412+
"ra",
425413
"ranch",
426414
"recon",
427415
"redbug",
428-
"seshat_alt",
416+
"seshat",
429417
"stdout_formatter",
430418
"syslog",
431419
"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.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)