Skip to content

Commit

Permalink
Fix test runner & upload coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
rm-hull committed Dec 2, 2023
1 parent ce20118 commit 2b422df
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/scala.yml
Expand Up @@ -25,7 +25,13 @@ jobs:
cache: 'sbt'

- name: Run tests
run: sbt coverage test coverageReport coverageAggregate coveralls
run: sbt coverage test coverageReport coverageAggregate

- name: Coveralls
uses: coverallsapp/github-action@v2
with:
format: cobertura
file: target/scala-2.13/coverage-report/cobertura.xml

- name: Upload dependency graph
uses: scalacenter/sbt-dependency-submission@ab086b50c947c9774b70f39fc7f6e20ca2706c91
17 changes: 9 additions & 8 deletions build.sbt
Expand Up @@ -48,7 +48,9 @@ lazy val core = (project in file("core"))
buildInfoPackage := "byok3",
buildInfoOptions += BuildInfoOption.BuildTime,
buildInfoOptions += BuildInfoOption.ToMap,
buildInfoOptions += BuildInfoOption.ToJson,)
buildInfoOptions += BuildInfoOption.ToJson,
Test / fork := true)


lazy val repl = (project in file("repl"))
.dependsOn(core)
Expand All @@ -58,7 +60,6 @@ lazy val repl = (project in file("repl"))
name := "byok3-repl",
assembly / assemblyJarName := "byok3-repl.jar",
Compile / mainClass := Some("byok3.console.REPL"),
// run / mainClass := Some("byok3.console.REPL"),
libraryDependencies ++= Seq(
"org.jline" % "jline" % "3.24.1"
)
Expand All @@ -71,14 +72,14 @@ lazy val web = (project in file("web"))
commonSettings,
name := "byok3-web",
assembly / assemblyJarName := "byok3-web.jar",
// run / mainClass := Some("byok3.web.Server"),
run / fork := true,
Compile / mainClass := Some("byok3.web.Server"),
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http" % "10.1.8",
"com.typesafe.akka" %% "akka-stream" % "2.6.4",
"com.typesafe.akka" %% "akka-actor" % "2.6.4",
"com.typesafe.akka" %% "akka-slf4j" % "2.6.4",
"ch.qos.logback" % "logback-classic" % "1.2.3"
"com.typesafe.akka" %% "akka-http" % "10.5.0",
"com.typesafe.akka" %% "akka-stream" % "2.8.0",
"com.typesafe.akka" %% "akka-actor" % "2.8.0",
"com.typesafe.akka" %% "akka-slf4j" % "2.8.0",
"ch.qos.logback" % "logback-classic" % "1.4.7"
),
Assets / WebKeys.packagePrefix := "public/",
Runtime / managedClasspath += (Assets / packageBin).value
Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
@@ -1,7 +1,6 @@
resolvers += Classpaths.typesafeReleases

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.9")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
Expand Down
1 change: 1 addition & 0 deletions repl/src/main/scala/byok3/console/REPL.scala
Expand Up @@ -27,6 +27,7 @@ import byok3.data_structures.Source._
import byok3.data_structures.{Context, Error}
import byok3.{Banner, Interruptible}
import cats.effect.IO
import cats.effect.unsafe.implicits.global
import cats.implicits._
import org.jline.reader.LineReader.Option._
import org.jline.reader.{EndOfFileException, LineReaderBuilder, UserInterruptException}
Expand Down

0 comments on commit 2b422df

Please sign in to comment.