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

[0.11.x] Prepare Scala 3 (partly backport #488) by @mkurz #496

Merged
merged 1 commit into from
Dec 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2023

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

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

You are currently cherry-picking commit bed3439.
  (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:   play-interop-test-java/src/test/scala/play/grpc/PlayJavaRouterSpec.scala
	modified:   play-runtime/src/main/scala/play/grpc/internal/AkkaGrpcClientFactory.scala
	modified:   play-scalatest/src/test/scala/play/grpc/scalatest/PlayActionsScalaTestSpec.scala
	modified:   play-scalatest/src/test/scala/play/grpc/scalatest/PlayScalaTestSpec.scala
	modified:   play-specs2/src/test/scala/play/grpc/specs2/PlaySpecs2Spec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   play-interop-test-scala/src/test/scala/play/grpc/PlayScalaRouterSpec.scala

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 Dec 21, 2023
@mergify mergify bot mentioned this pull request Dec 21, 2023
(cherry picked from commit bed3439)
@mkurz mkurz force-pushed the mergify/bp/0.11.x/pr-488 branch from f572f38 to 10b2572 Compare December 21, 2023 21:06
@mkurz mkurz changed the title [0.11.x] Add Scala 3 (backport #488) by @mkurz [0.11.x] Prepare Scala 3 (backport #488) by @mkurz Dec 21, 2023
@mkurz mkurz changed the title [0.11.x] Prepare Scala 3 (backport #488) by @mkurz [0.11.x] Prepare Scala 3 (partly backport #488) by @mkurz Dec 21, 2023
@mkurz mkurz merged commit e09b730 into 0.11.x Dec 21, 2023
@mkurz mkurz deleted the mergify/bp/0.11.x/pr-488 branch December 21, 2023 21:11
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