Skip to content

Commit f556005

Browse files
committed
Don't override with very old Scala versions on the CI
1 parent 96d1b39 commit f556005

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,9 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
520520
if (sv.startsWith("3")) "println(dotty.tools.dotc.config.Properties.simpleVersionString)"
521521
else "println(scala.util.Properties.versionNumberString)"
522522
anotherVersion =
523-
if (sv.startsWith("3")) Constants.scala3Lts
524-
else "2.13.7"
523+
if (sv.startsWith("2.13")) Constants.scala212
524+
else if (sv.startsWith("2.12")) Constants.scala213
525+
else Constants.scala3Lts
525526
} {
526527
test(
527528
s"default Scala version overridden with $sv by a launcher parameter is respected when running a script"
@@ -541,7 +542,7 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
541542
}
542543
}
543544
test(
544-
s"default Scala version overridden with $sv by a launcher parameter is overridable by -S"
545+
s"default Scala version overridden with $sv by a launcher parameter is overridable by -S passing $anotherVersion"
545546
) {
546547
TestInputs(os.rel / "simple.sc" -> code)
547548
.fromRoot { root =>

0 commit comments

Comments
 (0)