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

Add OTP 25.3 to the build and CI matrix as otp-max (backport #7540) (backport #7543) (backport #7545) #7546

Merged
merged 3 commits into from
Mar 8, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 8, 2023

This is an automatic backport of pull request #7545 done by Mergify.
Cherry-pick of 8a82109 has failed:

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

You are currently cherry-picking commit 8a82109fcf.
  (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/oci.yaml
	modified:   .github/workflows/test-selenium.yaml
	modified:   .github/workflows/update-otp-patches.yaml
	modified:   MODULE.bazel
	modified:   WORKSPACE
	modified:   bazel/platforms/BUILD.bazel
	modified:   packaging/docker-image/BUILD.bazel

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .bazelrc
	both modified:   .github/workflows/rabbitmq_peer_discovery_aws.yaml
	both modified:   .github/workflows/test-windows.yaml
	both modified:   .github/workflows/test.yaml

Cherry-pick of 7a00ca0 has failed:

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

You are currently cherry-picking commit 7a00ca0e7c.
  (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_amqp1_0/src/rabbit_amqp1_0_reader.erl

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 added 2 commits March 8, 2023 19:21
(cherry picked from commit 3ebfa25)
(cherry picked from commit 25c30d4)
(cherry picked from commit 8a82109)

# Conflicts:
#	.bazelrc
#	.github/workflows/rabbitmq_peer_discovery_aws.yaml
#	.github/workflows/test-windows.yaml
#	.github/workflows/test.yaml
(cherry picked from commit ba9c43d)
(cherry picked from commit 4d263d0)
(cherry picked from commit 7a00ca0)

# Conflicts:
#	deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl
@HoloRin HoloRin marked this pull request as draft March 8, 2023 20:28
@HoloRin HoloRin marked this pull request as ready for review March 8, 2023 20:36
@HoloRin HoloRin merged commit 0ea2f97 into v3.10.x Mar 8, 2023
@mergify mergify bot deleted the mergify/bp/v3.10.x/pr-7545 branch March 8, 2023 21:42
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