Skip to content

WIP: SN 0.5.6 -> 0.5.7 -> 0.5.8 #4362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 23 commits into
base: series/3.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,12 @@ Global / tlCommandAliases ++= Map(
)

lazy val nativeTestSettings = Seq(
nativeConfig ~= { c => // TODO: remove this when it seems to work
c.withSourceLevelDebuggingConfig(_.enableAll) // enable generation of debug information
nativeConfig ~= { c =>
c.withSourceLevelDebuggingConfig(_.enableAll.generateFunctionSourcePositions(false)) // `true` causes segfaults(?)
.withOptimize(false) // disable Scala Native optimizer
.withMode(Mode.debug) // compile using LLVM without optimizations
.withCompileOptions(c.compileOptions ++ Seq("-gdwarf-4"))
},
envVars ++= { if (inCI) Map("GC_MAXIMUM_HEAP_SIZE" -> "8g") else Map.empty[String, String] },
envVars ++= { if (inCI) Map("GC_MAXIMUM_HEAP_SIZE" -> "10g") else Map.empty[String, String] },
parallelExecution := !inCI
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import scala.scalanative.meta.LinktimeInfo
import scala.scalanative.posix.errno._
import scala.scalanative.posix.string._
import scala.scalanative.posix.unistd
import scala.scalanative.runtime.{Array => _, _}
import scala.scalanative.runtime.{Array => _, Throwable => _, _}
import scala.scalanative.unsafe._
import scala.scalanative.unsigned._

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.5")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,4 @@ class TracingSuite extends BaseSuite with TestInstances {
case _ => fail("expected IO.Delay")
}
}

}
Loading