Skip to content

Commit 671ce31

Browse files
Merge pull request #9906 from rabbitmq/mergify/bp/v3.12.x/pr-9903
Bump CLI deps, remove dialyxir (backport #9903)
2 parents b26c401 + 0fa5e9b commit 671ce31

File tree

7 files changed

+42
-34
lines changed

7 files changed

+42
-34
lines changed

MODULE.bazel

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ erlang_package.hex_package(
217217
erlang_package.hex_package(
218218
name = "csv",
219219
build_file = "@rabbitmq-server//bazel:BUILD.csv",
220-
sha256 = "cbbe5455c93df5f3f2943e995e28b7a8808361ba34cf3e44267d77a01eaf1609",
221-
version = "3.0.5",
220+
sha256 = "f5ee7299a55ff84fbe623d9aea7218b800d19ecccb2b3eac2bcb327d644365ea",
221+
version = "3.2.0",
222222
)
223223

224224
erlang_package.hex_package(
@@ -394,8 +394,8 @@ erlang_dev_package.hex_package(
394394
build_file = "@rabbitmq-server//bazel:BUILD.amqp",
395395
patch_args = ["-p1"],
396396
patches = ["@rabbitmq-server//bazel:amqp.patch"],
397-
sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
398-
version = "2.1.1",
397+
sha256 = "8d3ae139d2646c630d674a1b8d68c7f85134f9e8b2a1c3dd5621616994b10a8b",
398+
version = "3.3.0",
399399
)
400400

401401
erlang_dev_package.git_package(
@@ -404,13 +404,6 @@ erlang_dev_package.git_package(
404404
repository = "ninenines/ct_helper",
405405
)
406406

407-
erlang_dev_package.hex_package(
408-
name = "dialyxir",
409-
build_file = "@rabbitmq-server//bazel:BUILD.dialyxir",
410-
sha256 = "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73",
411-
version = "0.5.1",
412-
)
413-
414407
erlang_dev_package.git_package(
415408
name = "emqtt",
416409
branch = "master",
@@ -447,15 +440,14 @@ erlang_dev_package.hex_package(
447440
erlang_dev_package.hex_package(
448441
name = "x509",
449442
build_file = "@rabbitmq-server//bazel:BUILD.x509",
450-
sha256 = "3604125d6a0171da6e8a935810b58c999fccab0e3d20b2ed28d97fa2d9e2f6b4",
451-
version = "0.8.7",
443+
sha256 = "ccc3bff61406e5bb6a63f06d549f3dba3a1bbb456d84517efaaa210d8a33750f",
444+
version = "0.8.8",
452445
)
453446

454447
use_repo(
455448
erlang_dev_package,
456449
"amqp",
457450
"ct_helper",
458-
"dialyxir",
459451
"emqtt",
460452
"inet_tcp_proxy_dist",
461453
"meck",

bazel/BUILD.amqp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
2+
13
filegroup(
24
name = "sources",
35
srcs = [
@@ -8,3 +10,17 @@ filegroup(
810
]),
911
visibility = ["//visibility:public"],
1012
)
13+
14+
erlc_opts(
15+
name = "erlc_opts",
16+
values = select({
17+
"@rules_erlang//:debug_build": [
18+
"+debug_info",
19+
],
20+
"//conditions:default": [
21+
"+debug_info",
22+
"+deterministic",
23+
],
24+
}),
25+
visibility = [":__subpackages__"],
26+
)

bazel/BUILD.dialyxir

Lines changed: 0 additions & 10 deletions
This file was deleted.

bazel/BUILD.x509

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")
2+
13
filegroup(
24
name = "sources",
35
srcs = [
@@ -8,3 +10,17 @@ filegroup(
810
]),
911
visibility = ["//visibility:public"],
1012
)
13+
14+
erlc_opts(
15+
name = "erlc_opts",
16+
values = select({
17+
"@rules_erlang//:debug_build": [
18+
"+debug_info",
19+
],
20+
"//conditions:default": [
21+
"+debug_info",
22+
"+deterministic",
23+
],
24+
}),
25+
visibility = [":__subpackages__"],
26+
)

deps/rabbitmq_cli/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ rabbitmqctl_test(
151151
source_deps = {
152152
"@amqp//:sources": "amqp",
153153
"@csv//:sources": "csv",
154-
"@dialyxir//:sources": "dialyxir",
155154
"@json//:sources": "json",
156155
"@temp//:sources": "temp",
157156
"@x509//:sources": "x509",

deps/rabbitmq_cli/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ PROJECT = rabbitmq_cli
22

33
BUILD_DEPS = rabbit_common
44
DEPS = csv json observer_cli stdout_formatter
5-
TEST_DEPS = amqp amqp_client dialyxir temp x509 rabbit
5+
TEST_DEPS = amqp amqp_client temp x509 rabbit
66

7-
dep_amqp = hex 2.1.1
8-
dep_csv = hex 3.0.5
9-
dep_dialyxir = hex 0.5.1
7+
dep_amqp = hex 3.3.0
8+
dep_csv = hex 3.2.0
109
dep_json = hex 1.4.1
1110
dep_temp = hex 0.4.7
12-
dep_x509 = hex 0.7.0
11+
dep_x509 = hex 0.8.8
1312

1413
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
1514
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_cli/mix.exs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ defmodule RabbitMQCtl.MixfileBase do
171171
:amqp,
172172
path: Path.join(deps_dir, "amqp")
173173
},
174-
{
175-
:dialyxir,
176-
path: Path.join(deps_dir, "dialyxir"), runtime: false
177-
},
178174
{
179175
:rabbit,
180176
path: Path.join(deps_dir, "rabbit"),

0 commit comments

Comments
 (0)