ci test

rolang · Nov 26, 2023 · 348230c · 348230c
1 parent 5c953ce
commit 348230c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
 
       - name: Install native dependencies (ubuntu)
         if: (matrix.project == 'rootNative') && startsWith(matrix.os, 'ubuntu')
-        run: sudo apt update && sudo apt install libutf8proc-dev
+        run: sudo apt update && sudo apt install clang libutf8proc-dev -y
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck

diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ ThisBuild / tlCiHeaderCheck            := true
 ThisBuild / tlCiScalafixCheck          := false
 ThisBuild / githubWorkflowBuildPreamble ++= Seq(
   WorkflowStep.Run(
-    commands = List("sudo apt update && sudo apt install libutf8proc-dev"),
+    commands = List("sudo apt update && sudo apt install clang libutf8proc-dev -y"),
     cond = Some("(matrix.project == 'rootNative') && startsWith(matrix.os, 'ubuntu')"),
     name = Some("Install native dependencies (ubuntu)"),
   )
@@ -129,7 +129,7 @@ lazy val tests = crossProject(JVMPlatform, NativePlatform)
       _.withEmbedResources(
         // disabling embdedded resources for now in CI as it causes flaky tests.
         // should remove once this is resolved: https://github.com/scala-native/scala-native/issues/2024
-        sys.env.get("CI").isEmpty
+        true // sys.env.get("CI").isEmpty
       )
     },
   )

diff --git a/modules/tests/native/src/main/scala-3/ffstest/FFrameworkPlatform.scala b/modules/tests/native/src/main/scala-3/ffstest/FFrameworkPlatform.scala
@@ -16,8 +16,9 @@ trait FTestPlatform extends CatsEffectSuite {
 
   inline def dumboWithResources(path: String): DumboWithResourcesPartiallyApplied[IO] =
     // using this to disable embdedded resources for now in CI as it causes flaky tests: https://github.com/scala-native/scala-native/issues/2024
-    if sys.env.get("CI").isEmpty then Dumbo.withResourcesIn(path)
-    else Dumbo.withFilesIn(Path("modules/tests/shared/src/test/resources") / path)
+    Dumbo.withResourcesIn(path)
+    // if sys.env.get("CI").isEmpty then Dumbo.withResourcesIn(path)
+    // else Dumbo.withFilesIn(Path("modules/tests/shared/src/test/resources") / path)
 
   def dumboWithFiles(path: Path): DumboWithResourcesPartiallyApplied[IO] = Dumbo.withFilesIn(path)
 }