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

Fix bazel make drift (backport #10847) #10848

Merged
merged 4 commits into from
Mar 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 26, 2024

A few things drifted between build systems


This is an automatic backport of pull request #10847 done by Mergify.

@mergify mergify bot added the conflicts label Mar 26, 2024
Copy link
Author

mergify bot commented Mar 26, 2024

Cherry-pick of 9866ba6 has failed:

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

You are currently cherry-picking commit 9866ba621d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_amqp1_0/BUILD.bazel

no changes added to commit (use "git add" and/or "git commit -a")

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

HoloRin added 4 commits March 26, 2024 17:18
`bazel run gazelle-update-repos -- hex.pm/cowlib@2.13.0`

(cherry picked from commit 5b30b5b)
`bazel run gazelle-update-repos -- hex.pm/cowboy@2.12.0`

(cherry picked from commit e2a913a)
@HoloRin HoloRin force-pushed the mergify/bp/v3.13.x/pr-10847 branch from f5e9415 to 877bb58 Compare March 26, 2024 16:18
@michaelklishin michaelklishin added this to the 3.13.1 milestone Mar 26, 2024
@michaelklishin michaelklishin merged commit ce33f45 into v3.13.x Mar 26, 2024
19 of 20 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-10847 branch March 26, 2024 22:29
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