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

Bump versions (backport #11050) #11076

Merged
merged 8 commits into from Dec 29, 2021
Merged

Bump versions (backport #11050) #11076

merged 8 commits into from Dec 29, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 28, 2021

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

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

You are currently cherry-picking commit e7c1abd323.
  (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:   project/Dependencies.scala

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

Cherry-pick of 5a4aeb0 has failed:

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

You are currently cherry-picking commit 5a4aeb0ea1.
  (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:   documentation/manual/working/commonGuide/build/code/dependencies.sbt
	both modified:   documentation/manual/working/javaGuide/main/sql/code/jpa.sbt
	both modified:   project/Dependencies.scala

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

Cherry-pick of ac50a6e has failed:

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

You are currently cherry-picking commit ac50a6e0da.
  (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:   documentation/manual/hacking/BuildingFromSource.md
	modified:   documentation/manual/releases/release26/Highlights26.md
	modified:   documentation/manual/releases/release27/Highlights27.md
	modified:   documentation/manual/releases/release28/migration28/Migration28.md
	modified:   documentation/manual/working/commonGuide/build/sbtDependencies.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .travis.yml
	both modified:   documentation/build.sbt
	both modified:   documentation/manual/hacking/Translations.md
	deleted by us:   documentation/manual/releases/release29/migration29/Migration29.md
	both modified:   documentation/project/build.properties
	both modified:   project/build.properties

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

scala-steward and others added 4 commits December 28, 2021 23:31
(cherry picked from commit e7c1abd)

# Conflicts:
#	project/Dependencies.scala
(cherry picked from commit 5a4aeb0)

# Conflicts:
#	documentation/manual/working/commonGuide/build/code/dependencies.sbt
#	documentation/manual/working/javaGuide/main/sql/code/jpa.sbt
#	project/Dependencies.scala
(cherry picked from commit ac50a6e)

# Conflicts:
#	.travis.yml
#	documentation/build.sbt
#	documentation/manual/hacking/Translations.md
#	documentation/manual/releases/release29/migration29/Migration29.md
#	documentation/project/build.properties
#	project/build.properties
@mergify mergify bot added the conflicts label Dec 28, 2021
@mergify mergify bot mentioned this pull request Dec 28, 2021
@mkurz mkurz mentioned this pull request Dec 29, 2021
@mergify mergify bot merged commit bc5691d into 2.8.x Dec 29, 2021
@mergify mergify bot deleted the mergify/bp/2.8.x/pr-11050 branch December 29, 2021 10:45
@mkurz
Copy link
Member

mkurz commented Dec 29, 2021

For the record:
Netty 4.1.67 moved the TCP_FASTOPEN config from io.netty.channel.epoll.EpollChannelOption to io.netty.channel.ChannelOption (netty pr: netty/netty#11559), which influences the way it needs to be set in Play's application.conf. So this made scripted tests fail in this pr (which is targeted against the 2.8.x branch)
Interestingly enough however our master branch is using netty 4.1.67+ since almost four month now, but the scripted tests there never complained... That's because on master we don't even run scripted tests anymore for PR builds 😢 By default only scripted tests for sbt 1.3 ran, but in #10956 we removed support for sbt 1.3, including the associated scripted tests. So what was left were the scripted test for sbt 1.5 which are configured to run only for cron builds however. But, as we know, the cron build for the master branch is broken, so even the sbt 1.5 scripted tests never ran on master...
Anyway, I added the needed netty fixes for the master branch as part of #10969 and also enabled the sbt 1.5 scripted tests for PR builds there as well.

@mkurz mkurz added this to the 2.8.12 milestone Dec 29, 2021
@mkurz mkurz modified the milestones: 2.8.12, 2.8.13 Jan 12, 2022
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.

None yet

2 participants