Skip to content

Support the --test flag with the publish & publish local sub-commands #3538

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
Gedochao merged 1 commit into from
Apr 2, 2025
Merged

Support the --test flag with the publish & publish local sub-commands #3538

Show file tree
Hide file tree
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
25 changes: 14 additions & 11 deletions modules/build/src/main/scala/scala/build/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,13 @@ object Build {

val baseOptions = overrideOptions.orElse(sharedOptions)

val scopedSources = value(crossSources.scopedSources(baseOptions))
val scopedSources: ScopedSources = value(crossSources.scopedSources(baseOptions))

val mainSources =
val mainSources: Sources =
value(scopedSources.sources(Scope.Main, baseOptions, inputs.workspace, logger))
val mainOptions = mainSources.buildOptions

val testSources =
val testSources: Sources =
value(scopedSources.sources(Scope.Test, baseOptions, inputs.workspace, logger))
val testOptions = testSources.buildOptions

Expand Down Expand Up @@ -370,9 +370,7 @@ object Build {

def testBuildOpt(doc: Boolean = false): Either[BuildException, Option[Build]] = either {
if (buildTests) {
val actualCompilerOpt =
if (doc) docCompilerOpt
else Some(compiler)
val actualCompilerOpt = if doc then docCompilerOpt else Some(compiler)
actualCompilerOpt match {
case None => None
case Some(actualCompiler) =>
Expand All @@ -384,7 +382,14 @@ object Build {
extraClassPath = Seq(s.output)
)
)
val testOptions0 = extraTestOptions.orElse(testOptions)
val testOptions0 = {
val testOrExtra = extraTestOptions.orElse(testOptions)
testOrExtra
.copy(scalaOptions =
// Scala options between scopes need to be compatible
mainOptions.scalaOptions.orElse(testOrExtra.scalaOptions)
)
}
val isScala2 =
value(testOptions0.scalaParams).exists(_.scalaVersion.startsWith("2."))
val finalSources = if doc && isScala2 then
Expand Down Expand Up @@ -676,10 +681,8 @@ object Build {
): Either[BuildException, Unit] = {
val (errors, otherDiagnostics) = options.validate.partition(_.severity == Severity.Error)
logger.log(otherDiagnostics)
if (errors.nonEmpty)
Left(CompositeBuildException(errors.map(new ValidationException(_))))
else
Right(())
if errors.nonEmpty then Left(CompositeBuildException(errors.map(new ValidationException(_))))
else Right(())
}

def watch(
Expand Down
Loading