diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c59d2f..db6e617 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,11 +84,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: mkdir -p target model/target scodec/target fs2/target project/target + run: mkdir -p target integration/target fs2/target model/target scodec/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: tar cf targets.tar target model/target scodec/target fs2/target project/target + run: tar cf targets.tar target integration/target fs2/target model/target scodec/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') diff --git a/build.sbt b/build.sbt index 3350635..c055a35 100644 --- a/build.sbt +++ b/build.sbt @@ -43,23 +43,24 @@ ThisBuild / tlSonatypeUseLegacyHost := true // mima ThisBuild / mimaBinaryIssueFilters ++= Seq() -lazy val commonSettings = Defaults.itSettings ++ - headerSettings(Configurations.IntegrationTest) ++ - inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings) ++ Seq( - testFrameworks += new TestFramework("munit.Framework") - ) +lazy val commonSettings = Seq( + testFrameworks += new TestFramework("munit.Framework") +) + +lazy val noPublishSettings = Seq( + publish / skip := true, + mimaPreviousArtifacts := Set.empty +) lazy val `taxonomy` = project .in(file(".")) .settings(commonSettings) + .settings(noPublishSettings) .aggregate( `taxonomy-model`, `taxonomy-scodec`, - `taxonomy-fs2` - ) - .settings( - publish / skip := true, - mimaPreviousArtifacts := Set.empty + `taxonomy-fs2`, + integration ) lazy val `taxonomy-model` = project @@ -68,7 +69,6 @@ lazy val `taxonomy-model` = project lazy val `taxonomy-scodec` = project .in(file("scodec")) - .configs(IntegrationTest) .dependsOn(`taxonomy-model`) .settings(commonSettings) .settings( @@ -80,7 +80,6 @@ lazy val `taxonomy-scodec` = project lazy val `taxonomy-fs2` = project .in(file("fs2")) - .configs(IntegrationTest) .dependsOn(`taxonomy-scodec`) .settings(commonSettings) .settings( @@ -91,3 +90,14 @@ lazy val `taxonomy-fs2` = project Dependencies.Test.MUnitCE3 ) ) + +lazy val integration = project + .in(file("integration")) + .dependsOn(`taxonomy-fs2`) + .settings(commonSettings) + .settings(noPublishSettings) + .settings( + libraryDependencies ++= Seq( + Dependencies.Test.MUnitCE3 + ) + ) diff --git a/fs2/src/it/scala/fr/davit/taxonomy/fs2/DnsClientItSpec.scala b/integration/src/test/scala/fr/davit/taxonomy/fs2/DnsClientItSpec.scala similarity index 100% rename from fs2/src/it/scala/fr/davit/taxonomy/fs2/DnsClientItSpec.scala rename to integration/src/test/scala/fr/davit/taxonomy/fs2/DnsClientItSpec.scala diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5b69e2f..2e15a93 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val ScodecCore = "org.scodec" %% "scodec-core" % Versions.Scodec object Test { - val MUnitCE3 = "org.typelevel" %% "munit-cats-effect-3" % Versions.MUnitCE3 % "it,test" + val MUnitCE3 = "org.typelevel" %% "munit-cats-effect-3" % Versions.MUnitCE3 % "test" } }