Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify BUILD files by using new macros from rules_erlang 3.9.0 (backport #6928) (backport #6934) (backport #6936) #6949

Merged
merged 2 commits into from
Jan 19, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 19, 2023

This is an automatic backport of pull request #6936 done by Mergify.
Cherry-pick of 9e3f7d5 has failed:

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

You are currently cherry-picking commit 9e3f7d576e.
  (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/amqp10_client/BUILD.bazel
	modified:   deps/amqp10_common/BUILD.bazel
	modified:   deps/amqp_client/BUILD.bazel
	modified:   deps/rabbit_common/BUILD.bazel
	modified:   deps/rabbitmq_auth_backend_cache/BUILD.bazel
	modified:   deps/rabbitmq_auth_backend_http/BUILD.bazel
	modified:   deps/rabbitmq_auth_backend_ldap/BUILD.bazel
	modified:   deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
	modified:   deps/rabbitmq_event_exchange/BUILD.bazel
	modified:   deps/rabbitmq_federation_management/BUILD.bazel
	modified:   deps/rabbitmq_jms_topic_exchange/BUILD.bazel
	modified:   deps/rabbitmq_management/BUILD.bazel
	modified:   deps/rabbitmq_mqtt/BUILD.bazel
	modified:   deps/rabbitmq_peer_discovery_aws/BUILD.bazel
	modified:   deps/rabbitmq_peer_discovery_common/BUILD.bazel
	modified:   deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
	modified:   deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
	modified:   deps/rabbitmq_prometheus/BUILD.bazel
	modified:   deps/rabbitmq_random_exchange/BUILD.bazel
	modified:   deps/rabbitmq_recent_history_exchange/BUILD.bazel
	modified:   deps/rabbitmq_sharding/BUILD.bazel
	modified:   deps/rabbitmq_stream_common/BUILD.bazel
	modified:   deps/rabbitmq_stream_management/BUILD.bazel
	modified:   deps/rabbitmq_top/BUILD.bazel
	modified:   deps/rabbitmq_tracing/BUILD.bazel
	modified:   deps/rabbitmq_trust_store/BUILD.bazel
	modified:   deps/rabbitmq_web_mqtt/BUILD.bazel
	modified:   deps/rabbitmq_web_mqtt_examples/BUILD.bazel
	modified:   deps/rabbitmq_web_stomp/BUILD.bazel
	modified:   deps/rabbitmq_web_stomp_examples/BUILD.bazel
	modified:   deps/trust_store_http/BUILD.bazel
	modified:   rabbitmq.bzl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/BUILD.bazel
	both modified:   deps/rabbitmq_amqp1_0/BUILD.bazel
	both modified:   deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
	both modified:   deps/rabbitmq_federation/BUILD.bazel
	both modified:   deps/rabbitmq_management_agent/BUILD.bazel
	both modified:   deps/rabbitmq_peer_discovery_consul/BUILD.bazel
	both modified:   deps/rabbitmq_shovel/BUILD.bazel
	both modified:   deps/rabbitmq_shovel_management/BUILD.bazel
	both modified:   deps/rabbitmq_stomp/BUILD.bazel
	both modified:   deps/rabbitmq_stream/BUILD.bazel
	both modified:   deps/rabbitmq_web_dispatch/BUILD.bazel

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

…kport #6928) (backport #6934) (#6936)

* Simplify BUILD files by using new macros from rules_erlang 3.9.0 (backport #6928) (#6934)

* Use improved assert_suites2 macro from rules_erlang 3.9.0

(cherry picked from commit a317b30)

# Conflicts:
#	deps/rabbit/BUILD.bazel

* Invoke assert_suites macro in all deps/*

including those that don't currently have tests, in case tests are
added

(cherry picked from commit 5bb6090)

* Avoid the need to pass package name to rabbitmq_integration_suite

(cherry picked from commit 5ef8923)

# Conflicts:
#	deps/rabbit/BUILD.bazel

* Fixup backport

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit 7671052)

# Conflicts:
#	deps/rabbit/BUILD.bazel
#	deps/rabbitmq_amqp1_0/BUILD.bazel
#	deps/rabbitmq_federation/BUILD.bazel
#	deps/rabbitmq_management/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel

* Fixup backport

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit 9e3f7d5)

# Conflicts:
#	deps/rabbit/BUILD.bazel
#	deps/rabbitmq_amqp1_0/BUILD.bazel
#	deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
#	deps/rabbitmq_federation/BUILD.bazel
#	deps/rabbitmq_management_agent/BUILD.bazel
#	deps/rabbitmq_peer_discovery_consul/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stomp/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_web_dispatch/BUILD.bazel
@pjk25 pjk25 merged commit 35ab7a4 into v3.9.x Jan 19, 2023
@pjk25 pjk25 deleted the mergify/bp/v3.9.x/pr-6936 branch January 19, 2023 16:53
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.

None yet

1 participant