Skip to content

Commit

Permalink
-Xmx6g
Browse files Browse the repository at this point in the history
  • Loading branch information
sideeffffect committed May 31, 2024
1 parent 5cba4eb commit 205f23b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.14, 3.3.3]
java: [corretto@11]
exclude:
- scala: 3.3.3
runs-on: ${{ matrix.os }}
steps:
- uses: pierotofy/set-swap-space@master
Expand Down
2 changes: 1 addition & 1 deletion .jvmopts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-Xmx4g
-Xmx6g
-Xss4m
-XX:MaxMetaspaceSize=1g
-XX:ReservedCodeCacheSize=512m
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)

ThisBuild / githubWorkflowSbtCommand := "./sbt"

ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
MatrixExclude(Map("scala" -> scala3)) // TODO
)

val tzdbVersion = "2019c"
val scalajavaLocalesVersion = "1.5.4"
Global / onChangedBuildSource := ReloadOnSourceChanges
Expand Down Expand Up @@ -219,7 +215,11 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
"org.scalatest" %%% "scalatest" % "3.2.18" % Test,
scalacOptions ~= (_.filterNot(
Set("-Wnumeric-widen", "-Ywarn-numeric-widen", "-Ywarn-value-discard", "-Wvalue-discard")
))
)),
Test / test := {
if (scalaVersion.value == scala3) { (Test / compile).value }
else { (Test / test).value }
}
)
.jvmSettings(
// Fork the JVM test to ensure that the custom flags are set
Expand Down

0 comments on commit 205f23b

Please sign in to comment.