Skip to content

Commit

Permalink
Merge pull request #2819 from Gedochao/runner-n-test-runner-publishing
Browse files Browse the repository at this point in the history
Fix publishing of `runner` & `test-runner` artifacts
  • Loading branch information
Gedochao committed Mar 28, 2024
2 parents 51c891d + 41e464c commit fad4abc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -1256,7 +1256,7 @@ jobs:
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
- run: ./mill -i ci.setShouldPublish
- run: ./mill -i publishSonatype '{__[],_}.publishArtifacts'
- run: ./mill -i publishSonatype '{__[],_,test-runner[2.13.13],test-runner[2.12.19],runner[2.13.13],runner[2.12.19]}.publishArtifacts'
if: env.SHOULD_PUBLISH == 'true'
env:
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
Expand Down
17 changes: 13 additions & 4 deletions build.sc
Expand Up @@ -39,8 +39,17 @@ implicit def millModuleBasePath: define.Ctx.BasePath =

object cli extends Cross[Cli](Scala.scala3MainVersions) with CrossScalaDefaultToInternal

trait CrossScalaDefaultToInternal { _: mill.define.Cross[_] =>
def defaultCrossSegments = Seq(Scala.defaultInternal)
trait CrossScalaDefault { _: mill.define.Cross[_] =>
def crossScalaDefaultVersion: String
def defaultCrossSegments = Seq(crossScalaDefaultVersion)
}

trait CrossScalaDefaultToInternal extends CrossScalaDefault { _: mill.define.Cross[_] =>
def crossScalaDefaultVersion: String = Scala.defaultInternal
}

trait CrossScalaDefaultToRunner extends CrossScalaDefault { _: mill.define.Cross[_] =>
def crossScalaDefaultVersion: String = Scala.runnerScala3
}

// Publish a bootstrapped, executable jar for a restricted environments
Expand Down Expand Up @@ -82,9 +91,9 @@ object directives extends Cross[Directives](Scala.scala3MainVersions)
object core extends Cross[Core](Scala.scala3MainVersions) with CrossScalaDefaultToInternal
object `build-module` extends Cross[Build](Scala.scala3MainVersions)
with CrossScalaDefaultToInternal
object runner extends Cross[Runner](Scala.runnerScalaVersions) with CrossScalaDefaultToInternal
object runner extends Cross[Runner](Scala.runnerScalaVersions) with CrossScalaDefaultToRunner
object `test-runner` extends Cross[TestRunner](Scala.testRunnerScalaVersions)
with CrossScalaDefaultToInternal
with CrossScalaDefaultToRunner
object `tasty-lib` extends Cross[TastyLib](Scala.all) with CrossScalaDefaultToInternal
// Runtime classes used within native image on Scala 3 replacing runtime from Scala
object `scala3-runtime` extends Cross[Scala3Runtime](Scala.scala3MainVersions)
Expand Down

0 comments on commit fad4abc

Please sign in to comment.