Skip to content

Commit 93036e9

Browse files
Loïc Hoguinmergify-bot
authored andcommitted
Update Prometheus.erl to 4.8.2
(cherry picked from commit 2a24662) # Conflicts: # rabbitmq-components.mk
1 parent 09e2bbc commit 93036e9

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

rabbitmq-components.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,13 @@ dep_cowboy = hex 2.8.0
115115
dep_cowlib = hex 2.9.1
116116
dep_jsx = hex 3.1.0
117117
dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
118+
<<<<<<< HEAD
118119
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl 06425c21a39c1564164f1cc3fe5bdfa8b23b1f78
119120
dep_ra = hex 2.0.6
121+
=======
122+
dep_prometheus = hex 4.8.2
123+
dep_ra = git https://github.com/rabbitmq/ra.git main
124+
>>>>>>> 2a24662127 (Update Prometheus.erl to 4.8.2)
120125
dep_ranch = hex 2.1.0
121126
dep_recon = hex 2.5.2
122127
dep_redbug = hex 2.0.7

workspace_helpers.bzl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,9 @@ erlang_app(
172172
remote = "https://github.com/rabbitmq/osiris.git",
173173
)
174174

175-
github_erlang_app(
175+
hex_pm_erlang_app(
176176
name = "prometheus",
177-
repo = "prometheus.erl",
178-
org = "deadtrickster",
179-
ref = "06425c21a39c1564164f1cc3fe5bdfa8b23b1f78",
180-
version = "06425c21a39c1564164f1cc3fe5bdfa8b23b1f78",
177+
version = "4.8.2",
181178
first_srcs = [
182179
"src/prometheus_collector.erl",
183180
"src/prometheus_format.erl",
@@ -187,6 +184,7 @@ erlang_app(
187184
deps = [
188185
"@quantile_estimator//:erlang_app",
189186
],
187+
sha256 = "c3abd6521e52cec4f0d8eca603cf214dfc84d8a27aa85946639f1424b8554d98",
190188
)
191189

192190
github_erlang_app(

0 commit comments

Comments
 (0)