Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 17, 2023

This is an automatic backport of pull request #7295 done by Mergify.
Cherry-pick of 2ae27f2 has failed:

On branch mergify/bp/v3.10.x/pr-7295
Your branch is up to date with 'origin/v3.10.x'.

You are currently cherry-picking commit 2ae27f206f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbit/BUILD.bazel
	modified:   deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
	modified:   deps/rabbit/src/rabbit_access_control.erl
	modified:   deps/rabbit/src/rabbit_channel.erl
	modified:   deps/rabbit/src/rabbit_exchange.erl
	modified:   deps/rabbit/src/rabbit_guid.erl
	modified:   deps/rabbit/src/rabbit_router.erl
	modified:   deps/rabbit/src/vhost.erl
	modified:   deps/rabbit_common/BUILD.bazel
	modified:   deps/rabbit_common/src/rabbit_authz_backend.erl
	modified:   deps/rabbit_common/src/rabbit_binary_generator.erl
	modified:   deps/rabbit_common/src/rabbit_core_metrics.erl
	renamed:    deps/rabbit/src/rabbit_framing.erl -> deps/rabbit_common/src/rabbit_framing.erl
	modified:   deps/rabbit_common/src/rabbit_net.erl
	modified:   deps/rabbit_common/src/rabbit_types.erl
	modified:   deps/rabbit_common/src/rabbit_writer.erl
	modified:   deps/rabbitmq_amqp1_0/BUILD.bazel
	modified:   deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
	modified:   deps/rabbitmq_aws/BUILD.bazel
	modified:   deps/rabbitmq_cli/BUILD.bazel
	modified:   deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
	modified:   deps/rabbitmq_mqtt/BUILD.bazel
	modified:   deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
	modified:   deps/rabbitmq_stream_common/BUILD.bazel
	modified:   deps/rabbitmq_web_mqtt/BUILD.bazel
	modified:   rabbitmq.bzl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit_common/src/rabbit_misc.erl

Cherry-pick of b205ac9 has failed:

On branch mergify/bp/v3.10.x/pr-7295
Your branch is ahead of 'origin/v3.10.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b205ac9249.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbit/BUILD.bazel
	modified:   deps/rabbit/src/rabbit_access_control.erl
	modified:   deps/rabbit/src/rabbit_exchange.erl
	modified:   deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
	modified:   deps/rabbitmq_mqtt/BUILD.bazel

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit_common/src/rabbit_misc.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

binarin and others added 4 commits February 17, 2023 11:25
This is the latest commit in the series, it fixes (almost) all the
problems with missing and circular dependencies for typing.

The only 2 unsolved problems are:

- `lg` dependency for `rabbit` - the problem is that it's the only
  dependency that contains NIF. And there is no way to make dialyzer
  ignore it - looks like unknown check is not suppressable by dialyzer
  directives. In the future making `lg` a proper dependency can be a
  good thing anyway.

- some missing elixir function in `rabbitmq_cli` (CSV, JSON and
  logging related).

- `eetcd` dependency for `rabbitmq_peer_discovery_etcd` - this one
  uses sub-directories in `src/`, which confuses dialyzer (or our bazel
  machinery is not able to properly handle it). I've tried the latest
  rules_erlang which flattens directory for .beam files, but it wasn't
  enough for dialyzer - it wasn't able to find core erlang files. This
  is a niche plugin and an unusual dependency, so probably not worth
  investigating further.

(cherry picked from commit 949b535)
(cherry picked from commit 3a3ff30)

# Conflicts:
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/src/rabbit_access_control.erl
#	deps/rabbit/src/rabbit_exchange.erl
#	deps/rabbit_common/src/rabbit_misc.erl
#	deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
#	deps/rabbitmq_mqtt/BUILD.bazel
(cherry picked from commit 2ae27f2)

# Conflicts:
#	deps/rabbit_common/src/rabbit_misc.erl
(cherry picked from commit b205ac9)

# Conflicts:
#	deps/rabbit_common/src/rabbit_misc.erl
Leaving MQTT alone, as this branch does not contain
#5895, which fixed a
great many dialyzer warnings.

(cherry picked from commit 3f9e6f9)
@HoloRin HoloRin marked this pull request as draft February 17, 2023 11:40
@HoloRin HoloRin marked this pull request as ready for review February 17, 2023 12:08
@michaelklishin michaelklishin added this to the 3.10.19 milestone Feb 17, 2023
@HoloRin HoloRin marked this pull request as draft February 17, 2023 12:39
@HoloRin HoloRin marked this pull request as ready for review February 17, 2023 13:23
@HoloRin HoloRin merged commit 519bcfa into v3.10.x Feb 17, 2023
@mergify mergify bot deleted the mergify/bp/v3.10.x/pr-7295 branch February 17, 2023 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants