Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 13, 2023

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

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

You are currently cherry-picking commit ca1806dbcd.
  (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:   MODULE.bazel
	new file:   bazel/BUILD.osiris
	modified:   bazel/BUILD.redbug
	modified:   deps/amqp_client/BUILD.bazel
	modified:   deps/amqp_client/Makefile
	modified:   deps/rabbitmq_management_agent/Makefile
	modified:   deps/rabbitmq_web_dispatch/Makefile
	modified:   tools/compare_dist.sh
	modified:   tools/erlang_app_equal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/check-build-system-equivalence.yaml

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

…8209)

* Check additional applications when comparing bazel and make results

* Sync bazel/make for amqp_client

* Do not fail-fast in build system comparison

* promethus -> prometheus

* Regenerate BUILD.redbug

* When comparing build systems & .app files ignore empty 'registered'

It's listed as a required key in
https://www.erlang.org/doc/man/app.html, but the same docs state the
default is "[]". It seems to ignore it if it's empty.

* Copy bazel/BUILD.osiris from BUILD.bazel in the osiris repo

Normally it would be generated with `bazel run gazelle-update-repos --
-args osiris@1.5.1=github.com/rabbitmq/osiris@v1.5.1`, but in this
case we just want to match it's compilation with erlang.mk with some
manual tweaks.

* Use elixir 1.15, otherwise mix format fails

* Sync bazel/make for rabbitmq_web_dispatch, rabbitmq_management_agent

(cherry picked from commit ca1806d)

# Conflicts:
#	.github/workflows/check-build-system-equivalence.yaml
@michaelklishin michaelklishin added this to the 3.12.3 milestone Aug 13, 2023
This was referenced Aug 13, 2023
@michaelklishin michaelklishin merged commit 757eead into v3.12.x Aug 13, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-8209 branch August 13, 2023 08:49
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