Merge branch 'series/0.23' into update/series/0.23/scalafmt-core-3.6.1

Author: mergify[bot]

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        scala: [3.2.0, 2.12.17, 2.13.10]
+        scala: [3.2.1, 2.12.17, 2.13.10]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -71,29 +71,29 @@ jobs:
 
       - name: Check headers and formatting
         if: matrix.java == 'temurin@8'
-        run: sbt '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
+        run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
-        run: sbt '++${{ matrix.scala }}' test
+        run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
         if: matrix.java == 'temurin@8'
-        run: sbt '++${{ matrix.scala }}' mimaReportBinaryIssues
+        run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
         if: matrix.java == 'temurin@8'
-        run: sbt '++${{ matrix.scala }}' doc
+        run: sbt '++ ${{ matrix.scala }}' doc
 
       - name: Check Java formatting
-        run: sbt '++${{ matrix.scala }}' '${{ matrix.ci }}' javafmtCheckAll
+        run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}' javafmtCheckAll
 
       - name: Check scalafix lints
         if: matrix.java == 'temurin@8' && !startsWith(matrix.scala, '3.')
-        run: sbt '++${{ matrix.scala }}' 'scalafixAll --check'
+        run: sbt '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: Check unused compile dependencies
         if: matrix.java == 'temurin@8'
-        run: sbt '++${{ matrix.scala }}' unusedCompileDependenciesTest
+        run: sbt '++ ${{ matrix.scala }}' unusedCompileDependenciesTest
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -154,12 +154,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (3.2.0)
+      - name: Download target directories (3.2.1)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1
 
-      - name: Inflate target directories (3.2.0)
+      - name: Inflate target directories (3.2.1)
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -196,4 +196,4 @@ jobs:
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 
       - name: Publish
-        run: sbt '++${{ matrix.scala }}' tlRelease
+        run: sbt '++ ${{ matrix.scala }}' tlRelease

build.sbt

@@ -3,7 +3,7 @@ import Dependencies._
 
 val Scala212 = "2.12.17"
 val Scala213 = "2.13.10"
-val Scala3 = "3.2.0"
+val Scala3 = "3.2.1"
 val http4sVersion = "0.23.16"
 val munitCatsEffectVersion = "2.0.0-M3"
 

core/src/test/scala/org/http4s/blaze/pipeline/stages/SSLStageSuite.scala

@@ -61,7 +61,9 @@ class SSLStageSuite extends BlazeTestSuite {
       } yield ()
     }
 
-    test(testSuitePrefix + " should split large buffers") {
+    test((testSuitePrefix + " should split large buffers").flaky) {
+      // See https://github.com/http4s/blaze/pull/771 for a deeper
+      // analysis of the flake and possible solutions.
       val (headEng, stageEng) = mkClientServerEngines
       val s = "Fo" * (stageEng.getSession.getPacketBufferSize * 0.75).toInt
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.8.0

project/plugins.sbt

@@ -1,4 +1,4 @@
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.14.7")
+addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.14.9")

testkit/src/main/scala/org/http4s/blaze/testkit/BlazeTestSuite.scala

@@ -25,6 +25,9 @@ import scala.util.control.NonFatal
 
 abstract class BlazeTestSuite extends FunSuite with BlazeAssertions {
   implicit val executionContext: ExecutionContext = ExecutionContext.Implicits.global
+
+  // allow flaky tests on ci
+  override def munitFlakyOK: Boolean = sys.env.contains("CI")
 }
 
 trait BlazeAssertions { self: Assertions =>