Commit 6be0b49
* 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]>
1 parent f55dcb3 commit 6be0b49
File tree
5 files changed
+67
-299
lines changed- bazel
- deps
- rabbitmq_aws
- rabbitmq_peer_discovery_etcd
5 files changed
+67
-299
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
0 commit comments