Skip to content

Commit 205f23b

Browse files
committed
-Xmx6g
1 parent 5cba4eb commit 205f23b

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
os: [ubuntu-latest]
2525
scala: [2.12.17, 2.13.14, 3.3.3]
2626
java: [corretto@11]
27-
exclude:
28-
- scala: 3.3.3
2927
runs-on: ${{ matrix.os }}
3028
steps:
3129
- uses: pierotofy/set-swap-space@master

.jvmopts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-Xmx4g
1+
-Xmx6g
22
-Xss4m
33
-XX:MaxMetaspaceSize=1g
44
-XX:ReservedCodeCacheSize=512m

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
1919

2020
ThisBuild / githubWorkflowSbtCommand := "./sbt"
2121

22-
ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
23-
MatrixExclude(Map("scala" -> scala3)) // TODO
24-
)
25-
2622
val tzdbVersion = "2019c"
2723
val scalajavaLocalesVersion = "1.5.4"
2824
Global / onChangedBuildSource := ReloadOnSourceChanges
@@ -219,7 +215,11 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
219215
"org.scalatest" %%% "scalatest" % "3.2.18" % Test,
220216
scalacOptions ~= (_.filterNot(
221217
Set("-Wnumeric-widen", "-Ywarn-numeric-widen", "-Ywarn-value-discard", "-Wvalue-discard")
222-
))
218+
)),
219+
Test / test := {
220+
if (scalaVersion.value == scala3) { (Test / compile).value }
221+
else { (Test / test).value }
222+
}
223223
)
224224
.jvmSettings(
225225
// Fork the JVM test to ensure that the custom flags are set

0 commit comments

Comments
 (0)