Skip to content
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

Jump to bottom

Fix publishing of runner & test-runner artifacts #2819

Merged
merged 3 commits into from Mar 28, 2024
Merged

Fix publishing of runner & test-runner artifacts #2819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dd4baa
Fix runner module default Scala version to 3.0.2
Gedochao Mar 27, 2024
9497b8c
Fix test-runner module default Scala version to 3.0.2 (to match the s…
Gedochao Mar 27, 2024
41e464c
Publish `runner` & `test-runner` artifacts for Scala 2.12 & 2.13
Gedochao Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
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'
Gedochao marked this conversation as resolved.
Show resolved Hide resolved
if: env.SHOULD_PUBLISH == 'true'
env:
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
Expand Down
17 changes: 13 additions & 4 deletions build.sc
View file
Open in desktop
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