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

[2.9.x] Run tests with netty backend + mention netty backend in each README (backport #526) by @mkurz #529

Merged
merged 4 commits into from
Jan 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 23, 2024

This is an automatic backport of pull request #526 done by Mergify.
Cherry-pick of 5f30786 has failed:

On branch mergify/bp/2.9.x/pr-526
Your branch is up to date with 'origin/2.9.x'.

You are currently cherry-picking commit 5f307860.
  (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-java-chatroom-example/build.sbt
	modified:   play-java-compile-di-example/build.sbt
	modified:   play-java-dagger2-example/build.sbt
	modified:   play-java-ebean-example/build.sbt
	modified:   play-java-fileupload-example/build.sbt
	modified:   play-java-forms-example/build.sbt
	modified:   play-java-hello-world-tutorial/build.sbt
	modified:   play-java-jpa-example/build.sbt
	modified:   play-java-rest-api-example/build.sbt
	modified:   play-java-starter-example/build.sbt
	modified:   play-java-streaming-example/build.sbt
	modified:   play-java-websocket-example/build.sbt
	modified:   play-scala-anorm-example/build.sbt
	modified:   play-scala-chatroom-example/build.sbt
	modified:   play-scala-compile-di-example/build.sbt
	modified:   play-scala-fileupload-example/build.sbt
	modified:   play-scala-forms-example/build.sbt
	modified:   play-scala-hello-world-tutorial/build.sbt
	modified:   play-scala-isolated-slick-example/build.sbt
	modified:   play-scala-log4j2-example/build.sbt
	modified:   play-scala-macwire-di-example/build.sbt
	modified:   play-scala-rest-api-example/build.sbt
	modified:   play-scala-secure-session-example/build.sbt
	modified:   play-scala-slick-example/build.sbt
	modified:   play-scala-starter-example/build.sbt
	modified:   play-scala-streaming-example/build.sbt
	modified:   play-scala-websocket-example/build.sbt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   play-java-pekko-cluster-example/build.sbt

Cherry-pick of 128beef has failed:

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

You are currently cherry-picking commit 128beefe.
  (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-java-chatroom-example/README.md
	modified:   play-java-compile-di-example/README.md
	modified:   play-java-dagger2-example/README.md
	modified:   play-java-ebean-example/README.md
	modified:   play-java-fileupload-example/README.md
	modified:   play-java-forms-example/README.md
	modified:   play-java-hello-world-tutorial/README.md
	modified:   play-java-jpa-example/README.md
	modified:   play-java-rest-api-example/README.md
	modified:   play-java-starter-example/README.md
	modified:   play-java-streaming-example/README.md
	modified:   play-java-websocket-example/README.md
	modified:   play-scala-anorm-example/README.md
	modified:   play-scala-chatroom-example/README.md
	modified:   play-scala-compile-di-example/README.md
	modified:   play-scala-fileupload-example/README.md
	modified:   play-scala-forms-example/README.md
	modified:   play-scala-hello-world-tutorial/README.md
	modified:   play-scala-isolated-slick-example/README.md
	modified:   play-scala-log4j2-example/README.md
	modified:   play-scala-macwire-di-example/README.md
	modified:   play-scala-rest-api-example/README.md
	modified:   play-scala-secure-session-example/README.md
	modified:   play-scala-slick-example/README.md
	modified:   play-scala-starter-example/README.md
	modified:   play-scala-streaming-example/README.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   play-java-pekko-cluster-example/README.md
	both modified:   play-scala-websocket-example/README.md

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 Jan 23, 2024
@ihostage ihostage changed the title [2.9.x] [3.0.x] Run tests with netty backend + mention netty backend in each README (backport #526) by @mkurz [2.9.x]Run tests with netty backend + mention netty backend in each README (backport #526) by @mkurz Jan 23, 2024
@ihostage ihostage changed the title [2.9.x]Run tests with netty backend + mention netty backend in each README (backport #526) by @mkurz [2.9.x] Run tests with netty backend + mention netty backend in each README (backport #526) by @mkurz Jan 23, 2024
mkurz added 3 commits January 23, 2024 14:07
(cherry picked from commit 5f30786)

# Conflicts:
#	play-java-pekko-cluster-example/build.sbt
(cherry picked from commit 128beef)

# Conflicts:
#	play-java-pekko-cluster-example/README.md
#	play-scala-websocket-example/README.md
@mkurz mkurz force-pushed the mergify/bp/2.9.x/pr-526 branch from 953a3a1 to 3d48d44 Compare January 23, 2024 13:09
@mkurz mkurz merged commit b6a97bd into 2.9.x Jan 23, 2024
17 checks passed
@mkurz mkurz deleted the mergify/bp/2.9.x/pr-526 branch January 23, 2024 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant