Skip to content

Use Ranch 2.1.0 in bazel build (backport #3401) (backport #3403) #3404

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

Merged
merged 2 commits into from
Sep 11, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 10, 2021

This is an automatic backport of pull request #3403 done by Mergify.
Cherry-pick of d51fb99 has failed:

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

You are currently cherry-picking commit d51fb99710.
  (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/amqp_client/BUILD.bazel
	modified:   deps/rabbit_common/BUILD.bazel

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   BUILD.ranch
	both modified:   deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
	both modified:   deps/rabbitmq_aws/BUILD.bazel
	both modified:   workspace_helpers.bzl

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.io/

Matches 063d326

(cherry picked from commit 5fd9d1f)
(cherry picked from commit d51fb99)

# Conflicts:
#	BUILD.ranch
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	workspace_helpers.bzl
@HoloRin HoloRin force-pushed the mergify/bp/v3.8.x/pr-3403 branch from 14efa27 to a2b8f5a Compare September 10, 2021 15:07
@mergify mergify bot deleted the mergify/bp/v3.8.x/pr-3403 branch September 10, 2021 20:02
@michaelklishin
Copy link
Collaborator

This has to be merged manually due to conflicts.

@HoloRin HoloRin restored the mergify/bp/v3.8.x/pr-3403 branch September 11, 2021 08:38
@HoloRin HoloRin reopened this Sep 11, 2021
@HoloRin HoloRin merged commit d6eea87 into v3.8.x Sep 11, 2021
@HoloRin HoloRin deleted the mergify/bp/v3.8.x/pr-3403 branch September 11, 2021 15:11
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.

2 participants