Skip to content

Commit 2e933eb

Browse files
committed
Run all cross builds when --cross is passed
1 parent 420ca08 commit 2e933eb

File tree

5 files changed

+306
-282
lines changed

5 files changed

+306
-282
lines changed

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -451,10 +451,10 @@ object Build {
451451
(Nil, Nil, Nil, Nil)
452452

453453
Builds(
454-
Seq(nonCrossBuilds.main) ++ nonCrossBuilds.testOpt.toSeq,
455-
Seq(extraMainBuilds, extraTestBuilds),
456-
nonCrossBuilds.docOpt.toSeq ++ nonCrossBuilds.testDocOpt.toSeq,
457-
Seq(extraDocBuilds, extraDocTestBuilds)
454+
builds = Seq(nonCrossBuilds.main) ++ nonCrossBuilds.testOpt.toSeq,
455+
crossBuilds = Seq(extraMainBuilds, extraTestBuilds),
456+
docBuilds = nonCrossBuilds.docOpt.toSeq ++ nonCrossBuilds.testDocOpt.toSeq,
457+
docCrossBuilds = Seq(extraDocBuilds, extraDocTestBuilds)
458458
)
459459
}
460460

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -690,14 +690,6 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
690690
dummy: Boolean
691691
): Either[BuildException, Unit] = either {
692692
assert(docBuilds.isEmpty || docBuilds.length == builds.length)
693-
694-
extension (b: Seq[Build.Successful]) {
695-
private def groupedByCrossParams =
696-
b.groupBy(b =>
697-
b.options.scalaOptions.scalaVersion.map(_.asString).toString ->
698-
b.options.platform.toString
699-
)
700-
}
701693
val groupedBuilds = builds.groupedByCrossParams
702694
val groupedDocBuilds = docBuilds.groupedByCrossParams
703695
val it: Iterator[(Seq[Build.Successful], Seq[Build.Successful])] =

0 commit comments

Comments
 (0)