Skip to content

Commit 1830f65

Browse files
committed
Revert "-Xmx6g"
This reverts commit 205f23b.
1 parent 205f23b commit 1830f65

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ 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
2729
runs-on: ${{ matrix.os }}
2830
steps:
2931
- 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-
-Xmx6g
1+
-Xmx4g
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,6 +19,10 @@ ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
1919

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

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

0 commit comments

Comments
 (0)