Merge pull request #7 from VirtusLab/publish-latest-scalajs

Build scalajs-cli only for the latest version of scalajs

Author: lwronski

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           jvm: "temurin:17"
       - name: Test CLI
-        run: ./mill -i 'tests[_].test'
+        run: ./mill -i 'tests.test'
 
   publish:
     needs: test
@@ -51,7 +51,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-latest, macos-latest]
-        scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1", "1.11.0", "1.12.0", "1.13.0"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -62,22 +61,18 @@ jobs:
         with:
           jvm: temurin:17
       - run: |
-          ./mill -i "native[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
+          ./mill -i "native.writeNativeImageScript" generate.sh "" && \
           ./generate.sh && \
-          ./mill -i "tests[$scalaJsVersion].test.native" && \
-          ./mill -i "native[$scalaJsVersion].copyToArtifacts" artifacts/
+          ./mill -i "tests.test.native" && \
+          ./mill -i "native.copyToArtifacts" artifacts/
         if: runner.os != 'Windows'
-        env:
-          scalaJsVersion: ${{ matrix.scalaJsVersion }}
       - run: |
-          @call ./mill.bat -i "native[%scalaJsVersion%].writeNativeImageScript" generate.bat ""
+          @call ./mill.bat -i "native.writeNativeImageScript" generate.bat ""
           @call generate.bat
-          @call ./mill.bat -i "tests[%scalaJsVersion%].test.native"
-          @call ./mill.bat -i "native[%scalaJsVersion%].copyToArtifacts" artifacts/
+          @call ./mill.bat -i "tests.test.native"
+          @call ./mill.bat -i "native.copyToArtifacts" artifacts/
         shell: cmd
         if: runner.os == 'Windows'
-        env:
-          scalaJsVersion: ${{ matrix.scalaJsVersion }}
       - uses: actions/[email protected]
         with:
           name: launcher-${{ matrix.os }}
@@ -94,8 +89,6 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix:
-        scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1", "1.11.0", "1.12.0", "1.13.0"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -106,12 +99,10 @@ jobs:
         with:
           jvm: temurin:17
       - run: |
-          ./mill -i "native-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
+          ./mill -i "native-static.writeNativeImageScript" generate.sh "" && \
           ./generate.sh && \
-          ./mill -i "tests[$scalaJsVersion].test.nativeStatic" && \
-          ./mill -i "native-static[$scalaJsVersion].copyToArtifacts" artifacts/
-        env:
-          scalaJsVersion: ${{ matrix.scalaJsVersion }}
+          ./mill -i "tests.test.nativeStatic" && \
+          ./mill -i "native-static.copyToArtifacts" artifacts/
       - uses: actions/[email protected]
         with:
           name: launcher-${{ matrix.os }}-static
@@ -128,8 +119,6 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix:
-        scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1", "1.11.0", "1.12.0", "1.13.0"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -140,12 +129,10 @@ jobs:
         with:
           jvm: temurin:17
       - run: |
-          ./mill -i "native-mostly-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
+          ./mill -i "native-mostly-static.writeNativeImageScript" generate.sh "" && \
           ./generate.sh && \
-          ./mill -i "tests[$scalaJsVersion].test.nativeStatic" && \
-          ./mill -i "native-mostly-static[$scalaJsVersion].copyToArtifacts" artifacts/
-        env:
-          scalaJsVersion: ${{ matrix.scalaJsVersion }}
+          ./mill -i "tests.test.nativeStatic" && \
+          ./mill -i "native-mostly-static.copyToArtifacts" artifacts/
       - uses: actions/[email protected]
         with:
           name: launcher-${{ matrix.os }}-mostly-static

build.sc

@@ -18,29 +18,17 @@ import scala.util.Properties.isWin
 
 def scalaJsCliVersion = "1.1.1-sc5"
 def scala213 = "2.13.10"
-def latestScalaJsVersion = "1.13.0"
-def scalaJsVersions = Seq("1.9.0", "1.10.0", "1.10.1", "1.11.0", "1.12.0", latestScalaJsVersion)
-
-object cli extends Cross[Cli](scalaJsVersions: _*)
-
-class Cli(val scalaJsVersion0: String) extends ScalaModule with ScalaJsCliPublishModule {
+def scalaJsVersion = "1.13.0"
+object cli extends Cli
+trait Cli extends ScalaModule with ScalaJsCliPublishModule {
   def scalaVersion = scala213
   def artifactName = "scalajs" + super.artifactName()
   def ivyDeps = super.ivyDeps() ++ Seq(
-    ivy"org.scala-js::scalajs-linker:$scalaJsVersion0",
+    ivy"org.scala-js::scalajs-linker:$scalaJsVersion",
     ivy"com.github.scopt::scopt:4.1.0"
   )
-  def millSourcePath   = super.millSourcePath / os.up
-
   def mainClass = Some("org.scalajs.cli.Scalajsld")
 
-  def sources = T.sources {
-    val extra =
-      if (Version(scalaJsVersion0) == Version("1.9.0")) millSourcePath / "scala-js-1.9"
-      else millSourcePath / "scala-js-1.10+"
-    super.sources() ++ Seq(PathRef(extra))
-  }
-
   def transitiveJars: T[Agg[PathRef]] = {
 
     def allModuleDeps(todo: List[JavaModule]): List[JavaModule] = {
@@ -73,7 +61,6 @@ class Cli(val scalaJsVersion0: String) extends ScalaModule with ScalaJsCliPublis
       else None
 
     import coursier.launcher.{
-      AssemblyGenerator,
       BootstrapGenerator,
       ClassPathEntry,
       Parameters,
@@ -107,9 +94,8 @@ class Cli(val scalaJsVersion0: String) extends ScalaModule with ScalaJsCliPublis
   }
 }
 
-class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule with NativeImage {
+trait ScalaJsCliNativeImage extends ScalaModule with NativeImage {
   def scalaVersion = scala213
-  def scalaJsVersion = scalaJsVersion0
 
   def nativeImageClassPath = T{
     runClasspath()
@@ -127,7 +113,7 @@ class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule wit
   def nativeImageGraalVmJvmId = s"graalvm-java17:$graalVmVersion"
   def nativeImageName = "scala-js-ld"
   def moduleDeps() = Seq(
-    cli(scalaJsVersion0)
+    cli
   )
   def compileIvyDeps = super.compileIvyDeps() ++ Seq(
     ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
@@ -146,13 +132,13 @@ class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule wit
   }
 }
 
-object native extends Cross[ScalaJsCliNativeImage](scalaJsVersions: _*)
+object native extends ScalaJsCliNativeImage
 
 def native0 = native
 
 def csDockerVersion = "2.1.0-M5-18-gfebf9838c"
 
-class ScalaJsCliStaticNativeImage(scalaJsVersion0: String) extends ScalaJsCliNativeImage(scalaJsVersion0) {
+trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage {
   def nameSuffix = "-static"
   def buildHelperImage = T {
     os.proc("docker", "build", "-t", "scala-cli-base-musl:latest", ".")
@@ -173,9 +159,9 @@ class ScalaJsCliStaticNativeImage(scalaJsVersion0: String) extends ScalaJsCliNat
     super.writeNativeImageScript(scriptDest, imageDest)()
   }
 }
-object `native-static` extends Cross[ScalaJsCliStaticNativeImage](scalaJsVersions: _*)
+object `native-static` extends ScalaJsCliStaticNativeImage
 
-class ScalaJsCliMostlyStaticNativeImage(scalaJsVersion0: String) extends ScalaJsCliNativeImage(scalaJsVersion0) {
+trait ScalaJsCliMostlyStaticNativeImage extends ScalaJsCliNativeImage {
   def nameSuffix = "-mostly-static"
   def nativeImageDockerParams = Some(
     NativeImage.linuxMostlyStaticParams(
@@ -184,10 +170,9 @@ class ScalaJsCliMostlyStaticNativeImage(scalaJsVersion0: String) extends ScalaJs
     )
   )
 }
-object `native-mostly-static` extends Cross[ScalaJsCliMostlyStaticNativeImage](scalaJsVersions: _*)
+object `native-mostly-static` extends ScalaJsCliMostlyStaticNativeImage
 
-object tests extends Cross[Tests](scalaJsVersions: _*)
-class Tests(val scalaJsVersion0: String) extends ScalaModule {
+object tests extends ScalaModule {
   def scalaVersion = scala213
 
   object test extends Tests {
@@ -206,7 +191,7 @@ class Tests(val scalaJsVersion0: String) extends ScalaModule {
           val launcher = launcherTask().path
           val extraArgs = Seq(
             s"-Dtest.scala-js-cli.path=$launcher",
-            s"-Dtest.scala-js-cli.scala-js-version=$scalaJsVersion0"
+            s"-Dtest.scala-js-cli.scala-js-version=$scalaJsVersion"
           )
           args ++ extraArgs
         }
@@ -219,31 +204,13 @@ class Tests(val scalaJsVersion0: String) extends ScalaModule {
     def test(args: String*) =
       jvm(args: _*)
     def jvm(args: String*) =
-      new TestHelper(cli(scalaJsVersion0).standaloneLauncher).test(args: _*)
+      new TestHelper(cli.standaloneLauncher).test(args: _*)
     def native(args: String*) =
-      new TestHelper(native0(scalaJsVersion0).nativeImage).test(args: _*)
+      new TestHelper(native0.nativeImage).test(args: _*)
     def nativeStatic(args: String*) =
-      new TestHelper(`native-static`(scalaJsVersion0).nativeImage).test(args: _*)
+      new TestHelper(`native-static`.nativeImage).test(args: _*)
     def nativeMostlyStatic(args: String*) =
-      new TestHelper(`native-mostly-static`(scalaJsVersion0).nativeImage).test(args: _*)
-
-    private def updateRef(ref: PathRef): PathRef = {
-      val rawPath = ref.path.toString.replace(
-        File.separator + scalaJsVersion0 + File.separator,
-        File.separator
-      )
-      PathRef(os.Path(rawPath))
-    }
-    def sources = T.sources {
-      super.sources().flatMap { ref =>
-        Seq(updateRef(ref), ref)
-      }
-    }
-    def resources = T.sources {
-      super.resources().flatMap { ref =>
-        Seq(updateRef(ref), ref)
-      }
-    }
+      new TestHelper(`native-mostly-static`.nativeImage).test(args: _*)
   }
 }