Skip to content

Commit 2572880

Browse files
GedochaoMee-Tree
authored andcommitted
Skip using Scala nightlies in unit tests when they can't be fetched
1 parent e7d6443 commit 2572880

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Diff for: modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala

+12-12
Original file line numberDiff line numberDiff line change
@@ -329,23 +329,23 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
329329
val allScalaVersions = ScalaVersionUtil.allMatchingVersions(None, cache, repositories)
330330
for {
331331
(prefix, defaultMatchingVersion, predefinedDefaultScalaVersion) <- {
332-
val scala2Nightlies = allScalaVersions.filter(ScalaVersionUtil.isScala2Nightly)
333-
val latest212Nightly = scala2Nightlies.filter(_.startsWith("2.12")).maxBy(Version(_))
334-
val latest213Nightly = scala2Nightlies.filter(_.startsWith("2.13")).maxBy(Version(_))
335-
val latestScala3NextNightly =
336-
allScalaVersions
337-
.filter(ScalaVersionUtil.isScala3Nightly)
338-
.filter(_.startsWith(scala3NextPrefix))
339-
.maxBy(Version(_))
332+
extension (nightlies: Seq[String])
333+
private def latestNightly: Option[String] =
334+
if nightlies.nonEmpty then Some(nightlies.maxBy(Version(_))) else None
335+
val scala2Nightlies = allScalaVersions.filter(ScalaVersionUtil.isScala2Nightly)
336+
val scala212Nightlies = scala2Nightlies.filter(_.startsWith("2.12"))
337+
val scala213Nightlies = scala2Nightlies.filter(_.startsWith("2.13"))
338+
val scala3Nightlies = allScalaVersions.filter(ScalaVersionUtil.isScala3Nightly)
339+
val scala3NextNightlies = scala3Nightlies.filter(_.startsWith(scala3NextPrefix))
340340
Seq(
341341
("2.12", defaultScala212Version, None),
342-
("2.12", defaultScala212Version, Some(latest212Nightly)),
342+
("2.12", defaultScala212Version, scala212Nightlies.latestNightly),
343343
("2.13", defaultScala213Version, None),
344-
("2.13", defaultScala213Version, Some(latest213Nightly)),
344+
("2.13", defaultScala213Version, scala213Nightlies.latestNightly),
345345
("3", defaultScalaVersion, None),
346346
(scala3NextPrefix, defaultScalaVersion, None),
347-
(scala3NextPrefix, defaultScalaVersion, Some(latestScala3NextNightly))
348-
)
347+
(scala3NextPrefix, defaultScalaVersion, scala3NextNightlies.latestNightly)
348+
).distinct
349349
}
350350
options = BuildOptions(
351351
scalaOptions = ScalaOptions(

0 commit comments

Comments
 (0)