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

Use rules_elixir for rabbitmqctl (backport #11456) (backport #11485) #11510

Merged
merged 13 commits into from
Jun 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 20, 2024

Make use of rules_elixir, which externalized portions of the elixir related bazel code in this repository, and compiles rabbitmqctl and runs its tests without mix. Consequently, it is more efficient, and should be a bit more reliable.


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

Certain elixir-native deps are still build with mix, but this can be
corrected later

(cherry picked from commit 5debebf)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 7f585d4)

# Conflicts:
#	deps/rabbitmq_cli/BUILD.bazel
#	deps/rabbitmq_ct_helpers/BUILD.bazel
As they are no longer added automatically by the enclosing rule

(cherry picked from commit 35171eb)
(cherry picked from commit 04d6dc4)
(cherry picked from commit ba8cf2c)
(cherry picked from commit 1d11854)
I'm not actually sure why the changes to rabbitmqctl compilation
necessitated this change, but it seems to be the case

(cherry picked from commit 662ad8e)
(cherry picked from commit 2287a84)
It's technically a build target, so we didn't need to create a whole
new test rule, but it's marked as "manual" so that it doesn't cause
bazel build //... to fail

(cherry picked from commit f2add66)
(cherry picked from commit 7e8c959)
(cherry picked from commit a6b3916)
(cherry picked from commit 1de9bb9)

# Conflicts:
#	MODULE.bazel
which fixes and issue with escript_archive that was breaking the rabbitmqctl escript

(cherry picked from commit 5fc8a8c)
(cherry picked from commit 0ce73ff)
also set 'cfg =' appropriately

(cherry picked from commit 46250dc)
(cherry picked from commit 306c593)
(cherry picked from commit f73af61)
@mergify mergify bot added the conflicts label Jun 20, 2024
Copy link
Author

mergify bot commented Jun 20, 2024

Cherry-pick of 7f585d4 has failed:

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

You are currently cherry-picking commit 7f585d4102.
  (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:   .bazelrc
	modified:   BUILD.bazel
	modified:   MODULE.bazel
	modified:   bazel/BUILD.ranch
	modified:   bazel/bzlmod/extensions.bzl
	modified:   bazel/elixir/BUILD.bazel
	deleted:    bazel/elixir/elixir.bzl
	deleted:    bazel/elixir/elixir_as_app.bzl
	deleted:    bazel/elixir/elixir_build.bzl
	new file:   bazel/elixir/elixir_bytecode.bzl
	new file:   bazel/elixir/elixir_escript_main.bzl
	new file:   bazel/elixir/elixir_escript_main.exs
	deleted:    bazel/elixir/elixir_toolchain.bzl
	deleted:    bazel/elixir/iex_eval.bzl
	modified:   bazel/elixir/mix_archive_build.bzl
	deleted:    bazel/repositories/BUILD.bazel
	deleted:    bazel/repositories/BUILD_external.tpl
	deleted:    bazel/repositories/BUILD_internal.tpl
	deleted:    bazel/repositories/defaults.bzl.tpl
	deleted:    bazel/repositories/elixir_config.bzl
	modified:   deps/rabbit/BUILD.bazel
	modified:   deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
	modified:   deps/rabbitmq_cli/rabbitmqctl.bzl
	deleted:    deps/rabbitmq_cli/rabbitmqctl_check_formatted.bzl
	deleted:    deps/rabbitmq_cli/rabbitmqctl_test.bzl
	modified:   deps/rabbitmq_cli/test/core/command_modules_test.exs
	renamed:    deps/rabbitmq_cli/test/json_formatting.exs -> deps/rabbitmq_cli/test/json_formatting_test.exs
	modified:   deps/rabbitmq_cli/test/test_helper.exs
	modified:   deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
	modified:   deps/rabbitmq_ct_client_helpers/BUILD.bazel
	modified:   deps/rabbitmq_federation/BUILD.bazel
	modified:   deps/rabbitmq_federation_management/BUILD.bazel
	modified:   deps/rabbitmq_management/BUILD.bazel
	modified:   deps/rabbitmq_management_agent/BUILD.bazel
	modified:   deps/rabbitmq_mqtt/BUILD.bazel
	modified:   deps/rabbitmq_shovel/BUILD.bazel
	modified:   deps/rabbitmq_shovel_management/BUILD.bazel
	modified:   deps/rabbitmq_stomp/BUILD.bazel
	modified:   deps/rabbitmq_stream/BUILD.bazel
	modified:   deps/rabbitmq_stream_management/BUILD.bazel
	modified:   deps/rabbitmq_top/BUILD.bazel
	modified:   deps/rabbitmq_tracing/BUILD.bazel
	modified:   deps/rabbitmq_web_mqtt/BUILD.bazel
	modified:   deps/rabbitmq_web_stomp/BUILD.bazel
	modified:   rabbitmq.bzl
	modified:   rabbitmq_home.bzl

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

Cherry-pick of 1de9bb9 has failed:

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

You are currently cherry-picking commit 1de9bb9aab.
  (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:   MODULE.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

@mergify mergify bot added the bazel label Jun 20, 2024
@HoloRin HoloRin force-pushed the mergify/bp/v3.12.x/pr-11485 branch from d9ec56a to 3362965 Compare June 20, 2024 13:41
@michaelklishin michaelklishin merged commit 8eaa545 into v3.12.x Jun 22, 2024
197 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-11485 branch June 22, 2024 06:36
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