Skip to content

Commit

Permalink
Use the latest rules_erlang (backport #7315) (backport #7327) (#7329)
Browse files Browse the repository at this point in the history
* Regenerate bazel/BUILD.eetcd with the latest rules_erlang

`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
hex.pm/[email protected]`

Related to #7196

(cherry picked from commit 2dc0236)
(cherry picked from commit 733aad5)

# Conflicts:
#	MODULE.bazel
#	WORKSPACE

* Remove extra erlc_opts from BUILD.eetcd

Should be unnecessary once
rabbitmq/rules_erlang#140 is available in a
release

(cherry picked from commit b6e145c)
(cherry picked from commit d646ea4)

* Update the note about eetcd and dialyzer

now that the original issue has been resolved. We cannot bump gun just
yet, as eetcd is not yet compatible with gun 2.0.0

zhongwencool/eetcd#28
zhongwencool/eetcd#55
(cherry picked from commit 185e910)
(cherry picked from commit 31f5eec)

* Adjust the size of //deps/rabbit:bindings_SUITE to medium

generally speaking, rabbitmq_integration_suite tests do not reliably
run in under the 60s timeout implied by "small", at least in CI

(cherry picked from commit 60093ee)
(cherry picked from commit d56f004)

# Conflicts:
#	deps/rabbit/BUILD.bazel

* Add missing dep to //deps/rabbitmq_aws:eunit test

(cherry picked from commit 1bef97a)
(cherry picked from commit 60d09a3)

* Additional conflict resolution

---------

Co-authored-by: Rin Kuryloski <[email protected]>
  • Loading branch information
mergify[bot] and HoloRin authored Feb 17, 2023
1 parent f55dcb3 commit 6be0b49
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 299 deletions.
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bazel_dep(

bazel_dep(
name = "rules_erlang",
version = "3.9.2",
version = "3.9.5",
)

erlang_config = use_extension(
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
git_repository(
name = "rules_erlang",
remote = "https://github.com/rabbitmq/rules_erlang.git",
tag = "3.9.2",
tag = "3.9.5",
)

load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")
Expand Down
Loading

0 comments on commit 6be0b49

Please sign in to comment.