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 gazelle for external erlang deps (backport #6935) #7029

Merged
merged 2 commits into from
Jan 25, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 25, 2023

This is an automatic backport of pull request #6935 done by Mergify.
Cherry-pick of 2c7b37d has failed:

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

You are currently cherry-picking commit 2c7b37d7af.
  (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:   .github/workflows/test-windows.yaml
	modified:   BAZEL.md
	modified:   BUILD.bazel
	deleted:    BUILD.inet_tcp_proxy
	deleted:    BUILD.jose
	deleted:    BUILD.ranch
	modified:   MODULE.bazel
	modified:   WORKSPACE
	new file:   bazel/BUILD.accept
	new file:   bazel/BUILD.aten
	new file:   bazel/BUILD.base64url
	new file:   bazel/BUILD.bazel
	new file:   bazel/BUILD.cowboy
	new file:   bazel/BUILD.cowlib
	new file:   bazel/BUILD.credentials_obfuscation
	new file:   bazel/BUILD.ct_helper
	new file:   bazel/BUILD.cuttlefish
	new file:   bazel/BUILD.eetcd
	new file:   bazel/BUILD.emqtt
	new file:   bazel/BUILD.enough
	new file:   bazel/BUILD.gen_batch_server
	new file:   bazel/BUILD.getopt
	new file:   bazel/BUILD.gun
	new file:   bazel/BUILD.jose
	new file:   bazel/BUILD.meck
	new file:   bazel/BUILD.observer_cli
	new file:   bazel/BUILD.prometheus
	new file:   bazel/BUILD.proper
	new file:   bazel/BUILD.quantile_estimator
	new file:   bazel/BUILD.ra
	new file:   bazel/BUILD.ranch
	new file:   bazel/BUILD.recon
	new file:   bazel/BUILD.redbug
	new file:   bazel/BUILD.seshat
	new file:   bazel/BUILD.stdout_formatter
	new file:   bazel/BUILD.sysmon_handler
	new file:   bazel/BUILD.systemd
	new file:   bazel/BUILD.thoas
	new file:   moduleindex.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: 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.com

* Add gazelle for use with update-repos command

* Use explicit BUILD.app_name files for erlang app deps

This allows us to remove the duplicate definitions in
workspace_helpers.bzl

These files are generated with gazelle. For instance:
BUILD.ra is generated with `bazel run gazelle -- update-repos
--verbose --build_files_dir=bazel hex.pm/ra@2.4.6`

Running gazelle this way will modify the WORKSPACE file, as gazelle
does not yet support MODULE.bazel files. Such changes to the WORKSPACE
can be dropped, and should not be committed. It may also update the
`moduleindex.yaml` file. Changes to `moduleindex.yaml` should be
committed.

However
* skip the explicit bazel/BUILD.osiris file, as osiris already contains the file in its repo
* skip the explict BUILD.inet_tcp_proxy_dist file, since the repo already contains a bazel BUILD.bazel file
  gazelle command: `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
inet_tcp_proxy_dist=github.com/rabbitmq/inet_tcp_proxy@master`
* jose is imported with `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
jose=github.com/michaelklishin/erlang-jose@d63c1c5c8f9c1a4f1438e234b886de8607a0034e`

* Move the bats dep directly to WORKSPACE, drop workspace_helpers.bzl

* Use bzlmod in windows tests

(cherry picked from commit 2c7b37d)

# Conflicts:
#	workspace_helpers.bzl
@HoloRin HoloRin marked this pull request as draft January 25, 2023 08:43
@mergify mergify bot added the bazel label Jan 25, 2023
@HoloRin HoloRin marked this pull request as ready for review January 25, 2023 09:22
@HoloRin HoloRin merged commit c6dfe2f into v3.11.x Jan 25, 2023
mergify bot added a commit that referenced this pull request Jan 25, 2023
* Use gazelle for external erlang deps (#6935)

* Add gazelle for use with update-repos command

* Use explicit BUILD.app_name files for erlang app deps

This allows us to remove the duplicate definitions in
workspace_helpers.bzl

These files are generated with gazelle. For instance:
BUILD.ra is generated with `bazel run gazelle -- update-repos
--verbose --build_files_dir=bazel hex.pm/ra@2.4.6`

Running gazelle this way will modify the WORKSPACE file, as gazelle
does not yet support MODULE.bazel files. Such changes to the WORKSPACE
can be dropped, and should not be committed. It may also update the
`moduleindex.yaml` file. Changes to `moduleindex.yaml` should be
committed.

However
* skip the explicit bazel/BUILD.osiris file, as osiris already contains the file in its repo
* skip the explict BUILD.inet_tcp_proxy_dist file, since the repo already contains a bazel BUILD.bazel file
  gazelle command: `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
inet_tcp_proxy_dist=github.com/rabbitmq/inet_tcp_proxy@master`
* jose is imported with `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
jose=github.com/michaelklishin/erlang-jose@d63c1c5c8f9c1a4f1438e234b886de8607a0034e`

* Move the bats dep directly to WORKSPACE, drop workspace_helpers.bzl

* Use bzlmod in windows tests

(cherry picked from commit 2c7b37d)

# Conflicts:
#	workspace_helpers.bzl

* Fixup backport

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit c6dfe2f)

# Conflicts:
#	MODULE.bazel
#	workspace_helpers.bzl
@mergify mergify bot deleted the mergify/bp/v3.11.x/pr-6935 branch January 25, 2023 09:23
HoloRin added a commit that referenced this pull request Jan 25, 2023
#7030)

* Use gazelle for external erlang deps (backport #6935) (#7029)

* Use gazelle for external erlang deps (#6935)

* Add gazelle for use with update-repos command

* Use explicit BUILD.app_name files for erlang app deps

This allows us to remove the duplicate definitions in
workspace_helpers.bzl

These files are generated with gazelle. For instance:
BUILD.ra is generated with `bazel run gazelle -- update-repos
--verbose --build_files_dir=bazel hex.pm/ra@2.4.6`

Running gazelle this way will modify the WORKSPACE file, as gazelle
does not yet support MODULE.bazel files. Such changes to the WORKSPACE
can be dropped, and should not be committed. It may also update the
`moduleindex.yaml` file. Changes to `moduleindex.yaml` should be
committed.

However
* skip the explicit bazel/BUILD.osiris file, as osiris already contains the file in its repo
* skip the explict BUILD.inet_tcp_proxy_dist file, since the repo already contains a bazel BUILD.bazel file
  gazelle command: `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
inet_tcp_proxy_dist=github.com/rabbitmq/inet_tcp_proxy@master`
* jose is imported with `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
jose=github.com/michaelklishin/erlang-jose@d63c1c5c8f9c1a4f1438e234b886de8607a0034e`

* Move the bats dep directly to WORKSPACE, drop workspace_helpers.bzl

* Use bzlmod in windows tests

(cherry picked from commit 2c7b37d)

# Conflicts:
#	workspace_helpers.bzl

* Fixup backport

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit c6dfe2f)

# Conflicts:
#	MODULE.bazel
#	workspace_helpers.bzl

* Fixup backport

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
mergify bot added a commit that referenced this pull request Jan 25, 2023
#7030)

* Use gazelle for external erlang deps (backport #6935) (#7029)

* Use gazelle for external erlang deps (#6935)

* Add gazelle for use with update-repos command

* Use explicit BUILD.app_name files for erlang app deps

This allows us to remove the duplicate definitions in
workspace_helpers.bzl

These files are generated with gazelle. For instance:
BUILD.ra is generated with `bazel run gazelle -- update-repos
--verbose --build_files_dir=bazel hex.pm/ra@2.4.6`

Running gazelle this way will modify the WORKSPACE file, as gazelle
does not yet support MODULE.bazel files. Such changes to the WORKSPACE
can be dropped, and should not be committed. It may also update the
`moduleindex.yaml` file. Changes to `moduleindex.yaml` should be
committed.

However
* skip the explicit bazel/BUILD.osiris file, as osiris already contains the file in its repo
* skip the explict BUILD.inet_tcp_proxy_dist file, since the repo already contains a bazel BUILD.bazel file
  gazelle command: `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
inet_tcp_proxy_dist=github.com/rabbitmq/inet_tcp_proxy@master`
* jose is imported with `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
jose=github.com/michaelklishin/erlang-jose@d63c1c5c8f9c1a4f1438e234b886de8607a0034e`

* Move the bats dep directly to WORKSPACE, drop workspace_helpers.bzl

* Use bzlmod in windows tests

(cherry picked from commit 2c7b37d)

# Conflicts:
#	workspace_helpers.bzl

* Fixup backport

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit c6dfe2f)

# Conflicts:
#	MODULE.bazel
#	workspace_helpers.bzl

* Fixup backport

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit 85525f3)

# Conflicts:
#	MODULE.bazel
#	workspace_helpers.bzl
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.

1 participant