Skip to content

Commit fad4abc

Browse files
authored
Merge pull request #2819 from Gedochao/runner-n-test-runner-publishing
Fix publishing of `runner` & `test-runner` artifacts
2 parents 51c891d + 41e464c commit fad4abc

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ jobs:
12561256
env:
12571257
PGP_SECRET: ${{ secrets.PGP_SECRET }}
12581258
- run: ./mill -i ci.setShouldPublish
1259-
- run: ./mill -i publishSonatype '{__[],_}.publishArtifacts'
1259+
- run: ./mill -i publishSonatype '{__[],_,test-runner[2.13.13],test-runner[2.12.19],runner[2.13.13],runner[2.12.19]}.publishArtifacts'
12601260
if: env.SHOULD_PUBLISH == 'true'
12611261
env:
12621262
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}

build.sc

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,17 @@ implicit def millModuleBasePath: define.Ctx.BasePath =
3939

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

42-
trait CrossScalaDefaultToInternal { _: mill.define.Cross[_] =>
43-
def defaultCrossSegments = Seq(Scala.defaultInternal)
42+
trait CrossScalaDefault { _: mill.define.Cross[_] =>
43+
def crossScalaDefaultVersion: String
44+
def defaultCrossSegments = Seq(crossScalaDefaultVersion)
45+
}
46+
47+
trait CrossScalaDefaultToInternal extends CrossScalaDefault { _: mill.define.Cross[_] =>
48+
def crossScalaDefaultVersion: String = Scala.defaultInternal
49+
}
50+
51+
trait CrossScalaDefaultToRunner extends CrossScalaDefault { _: mill.define.Cross[_] =>
52+
def crossScalaDefaultVersion: String = Scala.runnerScala3
4453
}
4554

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

0 commit comments

Comments
 (0)