From 5dd4baa96d36267681a87bc06b92452007d1dd2f Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Wed, 27 Mar 2024 13:13:56 +0100 Subject: [PATCH 1/3] Fix runner module default Scala version to 3.0.2 --- build.sc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build.sc b/build.sc index da3dc9210f..23817c3aad 100644 --- a/build.sc +++ b/build.sc @@ -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 @@ -82,7 +91,7 @@ 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 object `tasty-lib` extends Cross[TastyLib](Scala.all) with CrossScalaDefaultToInternal From 9497b8c1d71ce440301d7b050028e1de01443e44 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Wed, 27 Mar 2024 15:02:42 +0100 Subject: [PATCH 2/3] Fix test-runner module default Scala version to 3.0.2 (to match the standard runner) --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 23817c3aad..b26207b706 100644 --- a/build.sc +++ b/build.sc @@ -93,7 +93,7 @@ object `build-module` extends Cross[Build](Scala.scala3MainVersions) 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) From 41e464cffc8aafcd35df17d4d914c58ed59a8a17 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Thu, 28 Mar 2024 12:00:17 +0100 Subject: [PATCH 3/3] Publish `runner` & `test-runner` artifacts for Scala 2.12 & 2.13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88c7402060..cdae7d3c19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }}