-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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 gazelle for some maintenance of bazel BUILD files (backport #6466) #7931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bazel build files are now maintained primarily with `bazel run gazelle`. This will analyze and merge changes into the build files as necessitated by certain code changes (e.g. the introduction of new modules). In some cases there hints to gazelle in the build files, such as `# gazelle:erlang...` or `# keep` comments. xref checks on plugins that depend on the cli are a good example. (cherry picked from commit 8de8f59) # Conflicts: # deps/rabbit/BUILD.bazel
HoloRin
added a commit
that referenced
this pull request
Apr 20, 2023
… (backport #7931) (#7936) * Use gazelle generated bazel files Bazel build files are now maintained primarily with `bazel run gazelle`. This will analyze and merge changes into the build files as necessitated by certain code changes (e.g. the introduction of new modules). In some cases there hints to gazelle in the build files, such as `# gazelle:erlang...` or `# keep` comments. xref checks on plugins that depend on the cli are a good example. (cherry picked from commit 8de8f59) # Conflicts: # deps/rabbit/BUILD.bazel (cherry picked from commit 2aaf217) # Conflicts: # BUILD.bazel # deps/amqp10_client/BUILD.bazel # deps/amqp_client/BUILD.bazel # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_amqp1_0/BUILD.bazel # deps/rabbitmq_auth_backend_cache/BUILD.bazel # deps/rabbitmq_auth_backend_http/BUILD.bazel # deps/rabbitmq_auth_backend_ldap/BUILD.bazel # deps/rabbitmq_auth_backend_oauth2/BUILD.bazel # deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_consistent_hash_exchange/BUILD.bazel # deps/rabbitmq_ct_client_helpers/BUILD.bazel # deps/rabbitmq_ct_helpers/BUILD.bazel # deps/rabbitmq_event_exchange/BUILD.bazel # deps/rabbitmq_federation/BUILD.bazel # deps/rabbitmq_federation_management/BUILD.bazel # deps/rabbitmq_jms_topic_exchange/BUILD.bazel # deps/rabbitmq_management/BUILD.bazel # deps/rabbitmq_management_agent/BUILD.bazel # deps/rabbitmq_mqtt/BUILD.bazel # deps/rabbitmq_peer_discovery_aws/BUILD.bazel # deps/rabbitmq_peer_discovery_common/BUILD.bazel # deps/rabbitmq_peer_discovery_consul/BUILD.bazel # deps/rabbitmq_peer_discovery_etcd/BUILD.bazel # deps/rabbitmq_peer_discovery_k8s/BUILD.bazel # deps/rabbitmq_prometheus/BUILD.bazel # deps/rabbitmq_random_exchange/BUILD.bazel # deps/rabbitmq_recent_history_exchange/BUILD.bazel # deps/rabbitmq_sharding/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_stream_common/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # deps/rabbitmq_top/BUILD.bazel # deps/rabbitmq_tracing/BUILD.bazel # deps/rabbitmq_trust_store/BUILD.bazel # deps/rabbitmq_web_dispatch/BUILD.bazel # deps/rabbitmq_web_mqtt/BUILD.bazel # deps/rabbitmq_web_mqtt_examples/BUILD.bazel # deps/rabbitmq_web_stomp/BUILD.bazel # deps/rabbitmq_web_stomp_examples/BUILD.bazel # rabbitmq.bzl * rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle (cherry picked from commit c1c450b) * Resolve merge conflicts * Resolve merge conflicts: maybe expression * bazel run gazelle * Resolve conflicts: ignore_warnings not yet available on plt rule * Resolve more conflicts * Re-run `bazel run gazelle` * Delete non-existent suites * bazel run gazelle with pre-release gazelle * Ignore warnings for mqtt dialyze again as they were never fixed on this branch * Add missing test helpers * Run bazel run gazelle * Restore the original -include_lib statements from before #6466 since this broke erlang_ls requires rules_erlang 3.9.13 (cherry picked from commit 854d01d) --------- Co-authored-by: Rin Kuryloski <[email protected]> Co-authored-by: Michael Klishin <[email protected]>
mergify bot
added a commit
that referenced
this pull request
Apr 20, 2023
… (backport #7931) (#7936) * Use gazelle generated bazel files Bazel build files are now maintained primarily with `bazel run gazelle`. This will analyze and merge changes into the build files as necessitated by certain code changes (e.g. the introduction of new modules). In some cases there hints to gazelle in the build files, such as `# gazelle:erlang...` or `# keep` comments. xref checks on plugins that depend on the cli are a good example. (cherry picked from commit 8de8f59) # Conflicts: # deps/rabbit/BUILD.bazel (cherry picked from commit 2aaf217) # Conflicts: # BUILD.bazel # deps/amqp10_client/BUILD.bazel # deps/amqp_client/BUILD.bazel # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_amqp1_0/BUILD.bazel # deps/rabbitmq_auth_backend_cache/BUILD.bazel # deps/rabbitmq_auth_backend_http/BUILD.bazel # deps/rabbitmq_auth_backend_ldap/BUILD.bazel # deps/rabbitmq_auth_backend_oauth2/BUILD.bazel # deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_consistent_hash_exchange/BUILD.bazel # deps/rabbitmq_ct_client_helpers/BUILD.bazel # deps/rabbitmq_ct_helpers/BUILD.bazel # deps/rabbitmq_event_exchange/BUILD.bazel # deps/rabbitmq_federation/BUILD.bazel # deps/rabbitmq_federation_management/BUILD.bazel # deps/rabbitmq_jms_topic_exchange/BUILD.bazel # deps/rabbitmq_management/BUILD.bazel # deps/rabbitmq_management_agent/BUILD.bazel # deps/rabbitmq_mqtt/BUILD.bazel # deps/rabbitmq_peer_discovery_aws/BUILD.bazel # deps/rabbitmq_peer_discovery_common/BUILD.bazel # deps/rabbitmq_peer_discovery_consul/BUILD.bazel # deps/rabbitmq_peer_discovery_etcd/BUILD.bazel # deps/rabbitmq_peer_discovery_k8s/BUILD.bazel # deps/rabbitmq_prometheus/BUILD.bazel # deps/rabbitmq_random_exchange/BUILD.bazel # deps/rabbitmq_recent_history_exchange/BUILD.bazel # deps/rabbitmq_sharding/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_stream_common/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # deps/rabbitmq_top/BUILD.bazel # deps/rabbitmq_tracing/BUILD.bazel # deps/rabbitmq_trust_store/BUILD.bazel # deps/rabbitmq_web_dispatch/BUILD.bazel # deps/rabbitmq_web_mqtt/BUILD.bazel # deps/rabbitmq_web_mqtt_examples/BUILD.bazel # deps/rabbitmq_web_stomp/BUILD.bazel # deps/rabbitmq_web_stomp_examples/BUILD.bazel # rabbitmq.bzl * rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle (cherry picked from commit c1c450b) * Resolve merge conflicts * Resolve merge conflicts: maybe expression * bazel run gazelle * Resolve conflicts: ignore_warnings not yet available on plt rule * Resolve more conflicts * Re-run `bazel run gazelle` * Delete non-existent suites * bazel run gazelle with pre-release gazelle * Ignore warnings for mqtt dialyze again as they were never fixed on this branch * Add missing test helpers * Run bazel run gazelle * Restore the original -include_lib statements from before #6466 since this broke erlang_ls requires rules_erlang 3.9.13 (cherry picked from commit 854d01d) --------- Co-authored-by: Rin Kuryloski <[email protected]> Co-authored-by: Michael Klishin <[email protected]> (cherry picked from commit e7f08df) # Conflicts: # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_shovel/BUILD.bazel # deps/rabbitmq_shovel_management/BUILD.bazel # deps/rabbitmq_stream/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # moduleindex.yaml
HoloRin
pushed a commit
that referenced
this pull request
Apr 25, 2023
… (backport #7931) (#7936) * Use gazelle generated bazel files Bazel build files are now maintained primarily with `bazel run gazelle`. This will analyze and merge changes into the build files as necessitated by certain code changes (e.g. the introduction of new modules). In some cases there hints to gazelle in the build files, such as `# gazelle:erlang...` or `# keep` comments. xref checks on plugins that depend on the cli are a good example. (cherry picked from commit 8de8f59) # Conflicts: # deps/rabbit/BUILD.bazel (cherry picked from commit 2aaf217) # Conflicts: # BUILD.bazel # deps/amqp10_client/BUILD.bazel # deps/amqp_client/BUILD.bazel # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_amqp1_0/BUILD.bazel # deps/rabbitmq_auth_backend_cache/BUILD.bazel # deps/rabbitmq_auth_backend_http/BUILD.bazel # deps/rabbitmq_auth_backend_ldap/BUILD.bazel # deps/rabbitmq_auth_backend_oauth2/BUILD.bazel # deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_consistent_hash_exchange/BUILD.bazel # deps/rabbitmq_ct_client_helpers/BUILD.bazel # deps/rabbitmq_ct_helpers/BUILD.bazel # deps/rabbitmq_event_exchange/BUILD.bazel # deps/rabbitmq_federation/BUILD.bazel # deps/rabbitmq_federation_management/BUILD.bazel # deps/rabbitmq_jms_topic_exchange/BUILD.bazel # deps/rabbitmq_management/BUILD.bazel # deps/rabbitmq_management_agent/BUILD.bazel # deps/rabbitmq_mqtt/BUILD.bazel # deps/rabbitmq_peer_discovery_aws/BUILD.bazel # deps/rabbitmq_peer_discovery_common/BUILD.bazel # deps/rabbitmq_peer_discovery_consul/BUILD.bazel # deps/rabbitmq_peer_discovery_etcd/BUILD.bazel # deps/rabbitmq_peer_discovery_k8s/BUILD.bazel # deps/rabbitmq_prometheus/BUILD.bazel # deps/rabbitmq_random_exchange/BUILD.bazel # deps/rabbitmq_recent_history_exchange/BUILD.bazel # deps/rabbitmq_sharding/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_stream_common/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # deps/rabbitmq_top/BUILD.bazel # deps/rabbitmq_tracing/BUILD.bazel # deps/rabbitmq_trust_store/BUILD.bazel # deps/rabbitmq_web_dispatch/BUILD.bazel # deps/rabbitmq_web_mqtt/BUILD.bazel # deps/rabbitmq_web_mqtt_examples/BUILD.bazel # deps/rabbitmq_web_stomp/BUILD.bazel # deps/rabbitmq_web_stomp_examples/BUILD.bazel # rabbitmq.bzl * rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle (cherry picked from commit c1c450b) * Resolve merge conflicts * Resolve merge conflicts: maybe expression * bazel run gazelle * Resolve conflicts: ignore_warnings not yet available on plt rule * Resolve more conflicts * Re-run `bazel run gazelle` * Delete non-existent suites * bazel run gazelle with pre-release gazelle * Ignore warnings for mqtt dialyze again as they were never fixed on this branch * Add missing test helpers * Run bazel run gazelle * Restore the original -include_lib statements from before #6466 since this broke erlang_ls requires rules_erlang 3.9.13 (cherry picked from commit 854d01d) --------- Co-authored-by: Rin Kuryloski <[email protected]> Co-authored-by: Michael Klishin <[email protected]> (cherry picked from commit e7f08df) # Conflicts: # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_shovel/BUILD.bazel # deps/rabbitmq_shovel_management/BUILD.bazel # deps/rabbitmq_stream/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # moduleindex.yaml
HoloRin
added a commit
that referenced
this pull request
Apr 25, 2023
… (backport #7931) (backport #7936) (#7954) * Use gazelle for some maintenance of bazel BUILD files (backport #6466) (backport #7931) (#7936) * Use gazelle generated bazel files Bazel build files are now maintained primarily with `bazel run gazelle`. This will analyze and merge changes into the build files as necessitated by certain code changes (e.g. the introduction of new modules). In some cases there hints to gazelle in the build files, such as `# gazelle:erlang...` or `# keep` comments. xref checks on plugins that depend on the cli are a good example. (cherry picked from commit 8de8f59) # Conflicts: # deps/rabbit/BUILD.bazel (cherry picked from commit 2aaf217) # Conflicts: # BUILD.bazel # deps/amqp10_client/BUILD.bazel # deps/amqp_client/BUILD.bazel # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_amqp1_0/BUILD.bazel # deps/rabbitmq_auth_backend_cache/BUILD.bazel # deps/rabbitmq_auth_backend_http/BUILD.bazel # deps/rabbitmq_auth_backend_ldap/BUILD.bazel # deps/rabbitmq_auth_backend_oauth2/BUILD.bazel # deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_consistent_hash_exchange/BUILD.bazel # deps/rabbitmq_ct_client_helpers/BUILD.bazel # deps/rabbitmq_ct_helpers/BUILD.bazel # deps/rabbitmq_event_exchange/BUILD.bazel # deps/rabbitmq_federation/BUILD.bazel # deps/rabbitmq_federation_management/BUILD.bazel # deps/rabbitmq_jms_topic_exchange/BUILD.bazel # deps/rabbitmq_management/BUILD.bazel # deps/rabbitmq_management_agent/BUILD.bazel # deps/rabbitmq_mqtt/BUILD.bazel # deps/rabbitmq_peer_discovery_aws/BUILD.bazel # deps/rabbitmq_peer_discovery_common/BUILD.bazel # deps/rabbitmq_peer_discovery_consul/BUILD.bazel # deps/rabbitmq_peer_discovery_etcd/BUILD.bazel # deps/rabbitmq_peer_discovery_k8s/BUILD.bazel # deps/rabbitmq_prometheus/BUILD.bazel # deps/rabbitmq_random_exchange/BUILD.bazel # deps/rabbitmq_recent_history_exchange/BUILD.bazel # deps/rabbitmq_sharding/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_stream_common/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # deps/rabbitmq_top/BUILD.bazel # deps/rabbitmq_tracing/BUILD.bazel # deps/rabbitmq_trust_store/BUILD.bazel # deps/rabbitmq_web_dispatch/BUILD.bazel # deps/rabbitmq_web_mqtt/BUILD.bazel # deps/rabbitmq_web_mqtt_examples/BUILD.bazel # deps/rabbitmq_web_stomp/BUILD.bazel # deps/rabbitmq_web_stomp_examples/BUILD.bazel # rabbitmq.bzl * rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle (cherry picked from commit c1c450b) * Resolve merge conflicts * Resolve merge conflicts: maybe expression * bazel run gazelle * Resolve conflicts: ignore_warnings not yet available on plt rule * Resolve more conflicts * Re-run `bazel run gazelle` * Delete non-existent suites * bazel run gazelle with pre-release gazelle * Ignore warnings for mqtt dialyze again as they were never fixed on this branch * Add missing test helpers * Run bazel run gazelle * Restore the original -include_lib statements from before #6466 since this broke erlang_ls requires rules_erlang 3.9.13 (cherry picked from commit 854d01d) --------- Co-authored-by: Rin Kuryloski <[email protected]> Co-authored-by: Michael Klishin <[email protected]> (cherry picked from commit e7f08df) # Conflicts: # deps/rabbit/BUILD.bazel # deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel # deps/rabbit_common/BUILD.bazel # deps/rabbitmq_aws/BUILD.bazel # deps/rabbitmq_shovel/BUILD.bazel # deps/rabbitmq_shovel_management/BUILD.bazel # deps/rabbitmq_stream/BUILD.bazel # deps/rabbitmq_stream_management/BUILD.bazel # moduleindex.yaml * Resolve merge conflicts * Fix a dialyzer warning in rabbitmq_stream_management * remove native.glob pass 1 * remove native.glob pass 2 * Use rules_erlang 3.9.14 * re-run bazel run gazelle once more * once more --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Rin Kuryloski <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #6466 done by Mergify.
Cherry-pick of 8de8f59 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com