Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 16, 2023

This is an automatic backport of pull request #7327 done by Mergify.
Cherry-pick of 733aad5 has failed:

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

You are currently cherry-picking commit 733aad5589.
  (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.eetcd

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   MODULE.bazel
	both modified:   WORKSPACE

Cherry-pick of 31f5eec has failed:

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

You are currently cherry-picking commit 31f5eec5f9.
  (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:   deps/rabbitmq_peer_discovery_etcd/BUILD.bazel

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d56f004 has failed:

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

You are currently cherry-picking commit d56f004324.
  (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:   deps/rabbit/BUILD.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/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

@HoloRin HoloRin marked this pull request as draft February 16, 2023 12:48
@HoloRin
Copy link
Contributor

HoloRin commented Feb 16, 2023

This should be rebased past #7295 once merged. Will leave as a draft until then.

`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
hex.pm/[email protected]`

Related to #7196

(cherry picked from commit 2dc0236)
(cherry picked from commit 733aad5)

# Conflicts:
#	MODULE.bazel
#	WORKSPACE
Should be unnecessary once
rabbitmq/rules_erlang#140 is available in a
release

(cherry picked from commit b6e145c)
(cherry picked from commit d646ea4)
now that the original issue has been resolved. We cannot bump gun just
yet, as eetcd is not yet compatible with gun 2.0.0

zhongwencool/eetcd#28
zhongwencool/eetcd#55
(cherry picked from commit 185e910)
(cherry picked from commit 31f5eec)
generally speaking, rabbitmq_integration_suite tests do not reliably
run in under the 60s timeout implied by "small", at least in CI

(cherry picked from commit 60093ee)
(cherry picked from commit d56f004)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 1bef97a)
(cherry picked from commit 60d09a3)
@HoloRin HoloRin force-pushed the mergify/bp/v3.11.x/pr-7327 branch from cdae680 to f8daa16 Compare February 17, 2023 11:27
@HoloRin HoloRin force-pushed the mergify/bp/v3.11.x/pr-7327 branch from 5499c42 to c990507 Compare February 17, 2023 11:39
@HoloRin HoloRin marked this pull request as ready for review February 17, 2023 12:50
@HoloRin HoloRin merged commit 6be0b49 into v3.11.x Feb 17, 2023
@mergify mergify bot deleted the mergify/bp/v3.11.x/pr-7327 branch February 17, 2023 12:51
mergify bot added a commit that referenced this pull request Feb 17, 2023
* Regenerate bazel/BUILD.eetcd with the latest rules_erlang

`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
hex.pm/[email protected]`

Related to #7196

(cherry picked from commit 2dc0236)
(cherry picked from commit 733aad5)

# Conflicts:
#	MODULE.bazel
#	WORKSPACE

* Remove extra erlc_opts from BUILD.eetcd

Should be unnecessary once
rabbitmq/rules_erlang#140 is available in a
release

(cherry picked from commit b6e145c)
(cherry picked from commit d646ea4)

* Update the note about eetcd and dialyzer

now that the original issue has been resolved. We cannot bump gun just
yet, as eetcd is not yet compatible with gun 2.0.0

zhongwencool/eetcd#28
zhongwencool/eetcd#55
(cherry picked from commit 185e910)
(cherry picked from commit 31f5eec)

* Adjust the size of //deps/rabbit:bindings_SUITE to medium

generally speaking, rabbitmq_integration_suite tests do not reliably
run in under the 60s timeout implied by "small", at least in CI

(cherry picked from commit 60093ee)
(cherry picked from commit d56f004)

# Conflicts:
#	deps/rabbit/BUILD.bazel

* Add missing dep to //deps/rabbitmq_aws:eunit test

(cherry picked from commit 1bef97a)
(cherry picked from commit 60d09a3)

* Additional conflict resolution

---------

Co-authored-by: Rin Kuryloski <[email protected]>
(cherry picked from commit 6be0b49)

# Conflicts:
#	deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
HoloRin pushed a commit that referenced this pull request Feb 17, 2023
* Regenerate bazel/BUILD.eetcd with the latest rules_erlang

`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
hex.pm/[email protected]`

Related to #7196

(cherry picked from commit 2dc0236)
(cherry picked from commit 733aad5)

# Conflicts:
#	MODULE.bazel
#	WORKSPACE

* Remove extra erlc_opts from BUILD.eetcd

Should be unnecessary once
rabbitmq/rules_erlang#140 is available in a
release

(cherry picked from commit b6e145c)
(cherry picked from commit d646ea4)

* Update the note about eetcd and dialyzer

now that the original issue has been resolved. We cannot bump gun just
yet, as eetcd is not yet compatible with gun 2.0.0

zhongwencool/eetcd#28
zhongwencool/eetcd#55
(cherry picked from commit 185e910)
(cherry picked from commit 31f5eec)

* Adjust the size of //deps/rabbit:bindings_SUITE to medium

generally speaking, rabbitmq_integration_suite tests do not reliably
run in under the 60s timeout implied by "small", at least in CI

(cherry picked from commit 60093ee)
(cherry picked from commit d56f004)

# Conflicts:
#	deps/rabbit/BUILD.bazel

* Add missing dep to //deps/rabbitmq_aws:eunit test

(cherry picked from commit 1bef97a)
(cherry picked from commit 60d09a3)

* Additional conflict resolution

---------

Co-authored-by: Rin Kuryloski <[email protected]>
(cherry picked from commit 6be0b49)

# Conflicts:
#	deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
HoloRin added a commit that referenced this pull request Feb 17, 2023
* Regenerate bazel/BUILD.eetcd with the latest rules_erlang

`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
hex.pm/[email protected]`

Related to #7196

(cherry picked from commit 2dc0236)
(cherry picked from commit 733aad5)

* Remove extra erlc_opts from BUILD.eetcd

Should be unnecessary once
rabbitmq/rules_erlang#140 is available in a
release

(cherry picked from commit b6e145c)
(cherry picked from commit d646ea4)

* Update the note about eetcd and dialyzer

now that the original issue has been resolved. We cannot bump gun just
yet, as eetcd is not yet compatible with gun 2.0.0

zhongwencool/eetcd#28
zhongwencool/eetcd#55
(cherry picked from commit 185e910)
(cherry picked from commit 31f5eec)

* Adjust the size of //deps/rabbit:bindings_SUITE to medium

generally speaking, rabbitmq_integration_suite tests do not reliably
run in under the 60s timeout implied by "small", at least in CI

(cherry picked from commit 60093ee)
(cherry picked from commit d56f004)

* Add missing dep to //deps/rabbitmq_aws:eunit test

(cherry picked from commit 1bef97a)
(cherry picked from commit 60d09a3)

* Additional conflict resolution

---------

Co-authored-by: Rin Kuryloski <[email protected]>
(cherry picked from commit 6be0b49)
HoloRin added a commit that referenced this pull request Feb 17, 2023
#7329) (#7352)

* Use the latest rules_erlang (backport #7315) (backport #7327) (#7329)

* Regenerate bazel/BUILD.eetcd with the latest rules_erlang

`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel
hex.pm/[email protected]`

Related to #7196

(cherry picked from commit 2dc0236)
(cherry picked from commit 733aad5)

* Remove extra erlc_opts from BUILD.eetcd

Should be unnecessary once
rabbitmq/rules_erlang#140 is available in a
release

(cherry picked from commit b6e145c)
(cherry picked from commit d646ea4)

* Update the note about eetcd and dialyzer

now that the original issue has been resolved. We cannot bump gun just
yet, as eetcd is not yet compatible with gun 2.0.0

zhongwencool/eetcd#28
zhongwencool/eetcd#55
(cherry picked from commit 185e910)
(cherry picked from commit 31f5eec)

* Adjust the size of //deps/rabbit:bindings_SUITE to medium

generally speaking, rabbitmq_integration_suite tests do not reliably
run in under the 60s timeout implied by "small", at least in CI

(cherry picked from commit 60093ee)
(cherry picked from commit d56f004)

* Add missing dep to //deps/rabbitmq_aws:eunit test

(cherry picked from commit 1bef97a)
(cherry picked from commit 60d09a3)

* Additional conflict resolution

---------

Co-authored-by: Rin Kuryloski <[email protected]>
(cherry picked from commit 6be0b49)

* thoas -> jsx

---------

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants