Switch to dedicated it subproject

alexcardell · May 1, 2024 · a0f47cb · a0f47cb
1 parent ded2112
commit a0f47cb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git 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 flipt/sdk-server/native/target flipt/sdk-server/js/target flipt/sdk-server/jvm/target project/target
+        run: mkdir -p flipt/sdk-server/native/target flipt/sdk-server/js/target flipt/sdk-server-it-jvm/.jvm/target flipt/sdk-server/jvm/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 flipt/sdk-server/native/target flipt/sdk-server/js/target flipt/sdk-server/jvm/target project/target
+        run: tar cf targets.tar flipt/sdk-server/native/target flipt/sdk-server/js/target flipt/sdk-server-it-jvm/.jvm/target flipt/sdk-server/jvm/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
@@ -23,15 +23,16 @@ ThisBuild / crossScalaVersions := Seq(Scala213, Scala33)
 ThisBuild / scalaVersion := Scala213 // the default Scala
 
 lazy val projects = Seq(
-  `flipt-sdk-server`
+  `flipt-sdk-server`,
+  `flipt-sdk-server-it`
 )
 
 lazy val commonDependencies = Seq(
   libraryDependencies ++= Seq(
     "org.typelevel" %%% "cats-core" % "2.10.0",
     "org.typelevel" %%% "cats-effect" % "3.5.3",
-    "org.scalameta" %%% "munit" % "1.0.0-RC1" % "test,it",
-    "org.typelevel" %%% "munit-cats-effect" % "2.0.0-M5" % "test,it"
+    "org.scalameta" %%% "munit" % "1.0.0-RC1" % Test,
+    "org.typelevel" %%% "munit-cats-effect" % "2.0.0-M5" % Test
   )
 )
 
@@ -42,18 +43,26 @@ lazy val `flipt-sdk-server` =
     .crossType(CrossType.Full)
     .in(file("flipt/sdk-server"))
     .settings(commonDependencies)
-    .configs(IntegrationTest)
-    .settings(Defaults.itSettings)
     .settings(
       name := "ff4s-flipt-sdk-server",
       libraryDependencies ++= Seq(
         "org.http4s" %%% "http4s-client" % "0.23.26",
         "org.http4s" %%% "http4s-ember-client" % "0.23.26",
         "org.http4s" %%% "http4s-circe" % "0.23.26",
-        "io.circe" %%% "circe-generic" % "0.14.7",
-        "com.dimafeng" %% "testcontainers-scala-munit" % "0.41.3" % "it"
-      ),
-      IntegrationTest / fork := true
+        "io.circe" %%% "circe-generic" % "0.14.7"
+      )
+    )
+
+lazy val `flipt-sdk-server-it` =
+  crossProject(JVMPlatform)
+    .crossType(CrossType.Pure)
+    .in(file("flipt/sdk-server-it"))
+    .dependsOn(`flipt-sdk-server`)
+    .settings(commonDependencies)
+    .settings(
+      libraryDependencies ++= Seq(
+        "com.dimafeng" %% "testcontainers-scala-munit" % "0.41.3" % Test
+      )
     )
 
 lazy val docs =

diff --git a/...rdell/ff4s/flipt/FliptApiImplItTest.scala → ...rdell/ff4s/flipt/FliptApiImplItTest.scala b/...rdell/ff4s/flipt/FliptApiImplItTest.scala → ...rdell/ff4s/flipt/FliptApiImplItTest.scala
@@ -17,7 +17,7 @@ import java.io.File
 class FliptApiImplItTest extends CatsEffectSuite with TestContainerForAll {
 
   override val containerDef: ContainerDef = DockerComposeContainer.Def(
-    new File("../../../docker-compose.yaml"),
+    new File("docker-compose.yaml"),
     exposedServices = Seq(
       ExposedService("flipt", 8080, Wait.forLogMessage("^UI: http.*", 1))
     ),