Skip to content

Skip using Scala nightlies in unit tests when they can't be fetched #3493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Skip using Scala nightlies in unit tests when they can't be fetched #3493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,23 +329,23 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
val allScalaVersions = ScalaVersionUtil.allMatchingVersions(None, cache, repositories)
for {
(prefix, defaultMatchingVersion, predefinedDefaultScalaVersion) <- {
val scala2Nightlies = allScalaVersions.filter(ScalaVersionUtil.isScala2Nightly)
val latest212Nightly = scala2Nightlies.filter(_.startsWith("2.12")).maxBy(Version(_))
val latest213Nightly = scala2Nightlies.filter(_.startsWith("2.13")).maxBy(Version(_))
val latestScala3NextNightly =
allScalaVersions
.filter(ScalaVersionUtil.isScala3Nightly)
.filter(_.startsWith(scala3NextPrefix))
.maxBy(Version(_))
extension (nightlies: Seq[String])
private def latestNightly: Option[String] =
if nightlies.nonEmpty then Some(nightlies.maxBy(Version(_))) else None
val scala2Nightlies = allScalaVersions.filter(ScalaVersionUtil.isScala2Nightly)
val scala212Nightlies = scala2Nightlies.filter(_.startsWith("2.12"))
val scala213Nightlies = scala2Nightlies.filter(_.startsWith("2.13"))
val scala3Nightlies = allScalaVersions.filter(ScalaVersionUtil.isScala3Nightly)
val scala3NextNightlies = scala3Nightlies.filter(_.startsWith(scala3NextPrefix))
Seq(
("2.12", defaultScala212Version, None),
("2.12", defaultScala212Version, Some(latest212Nightly)),
("2.12", defaultScala212Version, scala212Nightlies.latestNightly),
("2.13", defaultScala213Version, None),
("2.13", defaultScala213Version, Some(latest213Nightly)),
("2.13", defaultScala213Version, scala213Nightlies.latestNightly),
("3", defaultScalaVersion, None),
(scala3NextPrefix, defaultScalaVersion, None),
(scala3NextPrefix, defaultScalaVersion, Some(latestScala3NextNightly))
)
(scala3NextPrefix, defaultScalaVersion, scala3NextNightlies.latestNightly)
).distinct
}
options = BuildOptions(
scalaOptions = ScalaOptions(
Expand Down
Loading