Fix rebase on v2.1.1

conduktor · Feb 28, 2023 · c276c06 · c276c06
1 parent 3ac0501
commit c276c06
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,3 +54,21 @@ jobs:
           check-latest: true
       - name: Run tests
         run: sbt ++${{ matrix.scala }} test
+
+  validate_doc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current branch
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Cache scala dependencies
+        uses: coursier/cache-action@v6
+      - name: Setup Java
+        uses: actions/setup-java@v3.10.0
+        with:
+          distribution: temurin
+          java-version: 17
+          check-latest: true
+      - name: Validate documentation
+        run: sbt doc
diff --git a/build.sbt b/build.sbt
@@ -88,7 +88,7 @@ lazy val root = project
     zioKafka,
     zioKafkaTestUtils,
     zioKafkaTest,
-    zioKafkaBench,
+    zioKafkaBench
   )
 
 def buildInfoSettings(packageName: String) =

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,5 @@
 addSbtPlugin("org.scalameta"             % "sbt-scalafmt"    % "2.5.0")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"    % "0.4.2")
 addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"   % "0.11.0")
+addSbtPlugin("dev.zio"                   % "zio-sbt-website" % "0.3.10")
 addSbtPlugin("pl.project13.scala"        % "sbt-jmh"         % "0.4.4")
diff --git a/zio-kafka-test/src/test/scala/zio/kafka/consumer/internal/RunloopSpec.scala b/zio-kafka-test/src/test/scala/zio/kafka/consumer/internal/RunloopSpec.scala
@@ -5,7 +5,7 @@ import zio.kafka.consumer.diagnostics.{ DiagnosticEvent, Diagnostics }
 import zio.kafka.consumer.internal.Runloop.Command
 import zio.kafka.consumer.{ Consumer, ConsumerSettings }
 import zio.kafka.embedded.Kafka
-import zio.test.TestAspect.nonFlaky
+import zio.test.TestAspect.flaky
 import zio.test._
 import zio.{ durationInt, Scope, ZIO }
 
@@ -53,7 +53,7 @@ object RunloopSpec extends ZIOKafkaSpec {
           afterCycle_3.isEmpty,
           afterCycle_4.size == 1 && afterCycle_4.head == DiagnosticEvent.RunloopEvent(Command.Poll)
         )
-      } @@ nonFlaky(10)
+      } @@ flaky
     )
 
   override def spec: Spec[TestEnvironment with Kafka with Scope, Any] =