Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 16, 2023

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

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

You are currently cherry-picking commit fc29e3b575.
  (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:   bazel/BUILD.accept
	modified:   bazel/BUILD.aten
	modified:   bazel/BUILD.base64url
	modified:   bazel/BUILD.cowboy
	modified:   bazel/BUILD.cowlib
	modified:   bazel/BUILD.credentials_obfuscation
	modified:   bazel/BUILD.ct_helper
	modified:   bazel/BUILD.cuttlefish
	modified:   bazel/BUILD.emqtt
	modified:   bazel/BUILD.enough
	modified:   bazel/BUILD.gen_batch_server
	modified:   bazel/BUILD.getopt
	modified:   bazel/BUILD.gun
	modified:   bazel/BUILD.meck
	modified:   bazel/BUILD.observer_cli
	modified:   bazel/BUILD.prometheus
	modified:   bazel/BUILD.proper
	modified:   bazel/BUILD.quantile_estimator
	modified:   bazel/BUILD.ra
	modified:   bazel/BUILD.ranch
	modified:   bazel/BUILD.recon
	modified:   bazel/BUILD.redbug
	modified:   bazel/BUILD.seshat
	modified:   bazel/BUILD.stdout_formatter
	modified:   bazel/BUILD.sysmon_handler
	modified:   bazel/BUILD.systemd
	modified:   bazel/BUILD.thoas

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

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

@mergify mergify bot added the conflicts label Feb 16, 2023
@HoloRin
Copy link
Contributor

HoloRin commented Feb 17, 2023

Needs #7329

@HoloRin HoloRin marked this pull request as draft February 17, 2023 09:06
rules_erlang 3.9.5+ generates "compact" rules when running
update-repos

this speeds up the cold build, since fewer erlc actions are run, and
since external deps typically don't change incrementally, the value of
having a bazel rule per file is miminal

(cherry picked from commit 5cb434f)
(cherry picked from commit 279efd6)
(cherry picked from commit fc29e3b)
(cherry picked from commit e7cddb0)
(cherry picked from commit 88036da)
(cherry picked from commit 17d2182)
until rabbitmq/rules_erlang#147 is released

(cherry picked from commit 36a4b5b)
(cherry picked from commit b39791b)
(cherry picked from commit 283ac3b)
@HoloRin HoloRin force-pushed the mergify/bp/v3.10.x/pr-7344 branch from 38ca8d1 to 949a98e Compare February 17, 2023 14:07
@HoloRin HoloRin marked this pull request as ready for review February 20, 2023 09:46
@HoloRin HoloRin merged commit f725308 into v3.10.x Feb 20, 2023
@mergify mergify bot deleted the mergify/bp/v3.10.x/pr-7344 branch February 20, 2023 09:47
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