Tweak things

Author: alexarchambault

.github/workflows/ci.yml

@@ -6,10 +6,9 @@ on:
     tags:
       - "v*"
   pull_request:
-    branches:
-      - master
+
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -22,8 +21,10 @@ jobs:
         with:
           jvm: "temurin:17"
       - name: Test CLI
-        run: ./scripts/test-cli.sh
+        run: ./mill -i ci.testCli
+
   publish:
+    needs: test
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
@@ -34,9 +35,122 @@ jobs:
       - uses: VirtusLab/scala-cli-setup@0dab3c3ec860f0443d4d25a56a549f9f46204389
         with:
           jvm: "temurin:17"
-      - run: ./mill -i ci.publishSonatype Cli.publishArtifacts
+      - run: ./mill -i ci.publishSonatype __.publishArtifacts
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+
+  generate-launchers:
+    needs: test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: coursier/[email protected]
+      - uses: coursier/[email protected]
+        with:
+          jvm: temurin:17
+      - run: |
+          ./mill -i "native[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
+          ./generate.sh && \
+          ./mill -i "native[$scalaJsVersion].testNative" && \
+          ./mill -i "native[$scalaJsVersion].copyToArtifacts" artifacts/
+        if: runner.os != 'Windows'
+        env:
+          scalaJsVersion: ${{ matrix.scalaJsVersion }}
+      - run: |
+          @call ./mill.bat -i "native[%scalaJsVersion%].writeNativeImageScript" generate.bat ""
+          @call generate.bat
+          @call ./mill.bat -i "native[%scalaJsVersion%].testNative"
+          @call ./mill.bat -i "native[%scalaJsVersion%].copyToArtifacts" artifacts/
+        shell: cmd
+        if: runner.os == 'Windows'
+        env:
+          scalaJsVersion: ${{ matrix.scalaJsVersion }}
+      - uses: actions/[email protected]
+        with:
+          name: launcher-${{ matrix.os }}
+          path: artifacts/
+          if-no-files-found: error
+          retention-days: 1
+      - run: ./mill -i ci.upload artifacts/
+        if: github.event_name == 'push'
+        env:
+          UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  generate-static-launcher:
+    needs: test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: coursier/[email protected]
+      - uses: coursier/[email protected]
+        with:
+          jvm: temurin:17
+      - run: |
+          ./mill -i "native-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
+          ./generate.sh && \
+          ./mill -i "native-static[$scalaJsVersion].testNative" && \
+          ./mill -i "native-static[$scalaJsVersion].copyToArtifacts" artifacts/
+        env:
+          scalaJsVersion: ${{ matrix.scalaJsVersion }}
+      - uses: actions/[email protected]
+        with:
+          name: launcher-${{ matrix.os }}-static
+          path: artifacts/
+          if-no-files-found: error
+          retention-days: 1
+      - run: ./mill -i upload artifacts/
+        if: github.event_name == 'push'
+        env:
+          UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  generate-mostly-static-launcher:
+    needs: test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: coursier/[email protected]
+      - uses: coursier/[email protected]
+        with:
+          jvm: temurin:17
+      - run: |
+          ./mill -i "native-mostly-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
+          ./generate.sh && \
+          ./mill -i "native-mostly-static[$scalaJsVersion].testNative" && \
+          ./mill -i "native-mostly-static[$scalaJsVersion].copyToArtifacts" artifacts/
+        env:
+          scalaJsVersion: ${{ matrix.scalaJsVersion }}
+      - uses: actions/[email protected]
+        with:
+          name: launcher-${{ matrix.os }}-mostly-static
+          path: artifacts/
+          if-no-files-found: error
+          retention-days: 1
+      - run: ./mill -i upload artifacts/
+        if: github.event_name == 'push'
+        env:
+          UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/launchers.yml

@@ -1,5 +1,2 @@
-target/
 /.bsp/
-/pack/
-/cli-test/
-out/
+out/

.gitignore

@@ -11,22 +11,23 @@ import mill.scalalib._
 import coursier.core.Version
 
 import scala.concurrent.duration._
+import scala.util.Properties.isWin
 
 
 def scalaJsCliVersion = "1.1.1-sc5"
 def scala213 = "2.13.8"
 def latestScalaJsVersion = "1.10.1"
 def scalaJsVersions = Seq("1.9.0", "1.10.0", latestScalaJsVersion)
 
-object cli extends Cli(latestScalaJsVersion)
+object cli extends Cross[Cli](scalaJsVersions: _*)
 
 class Cli(val scalaJsVersion0: String) extends ScalaModule with ScalaJsCliPublishModule {
   def scalaVersion = scala213
   def ivyDeps = super.ivyDeps() ++ Seq(
     ivy"org.scala-js::scalajs-linker:$scalaJsVersion0",
     ivy"com.github.scopt::scopt:4.1.0"
   )
-  def millSourcePath   = super.millSourcePath / os.up / "cli"
+  def millSourcePath   = super.millSourcePath / os.up
 
   def mainClass = Some("org.scalajs.cli.Scalajsld")
 
@@ -75,7 +76,6 @@ class Cli(val scalaJsVersion0: String) extends ScalaModule with ScalaJsCliPublis
       Parameters,
       Preamble
     }
-    import scala.util.Properties.isWin
     val cp = jarClassPath().map(_.path)
     val mainClass0 = mainClass().getOrElse(sys.error("No main class"))
 
@@ -124,7 +124,7 @@ class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule wit
   def nativeImageGraalVmJvmId = s"graalvm-java17:$graalVmVersion"
   def nativeImageName = "scala-js-ld"
   def moduleDeps() = Seq(
-    new Cli(scalaJsVersion0)
+    cli(scalaJsVersion0)
   )
   def compileIvyDeps = super.compileIvyDeps() ++ Seq(
     ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
@@ -141,6 +141,15 @@ class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule wit
       suffix = nameSuffix
     )
   }
+
+  def testNative() = T.command {
+    val path = nativeImage().path
+    System.err.println(s"Testing ${path.relativeTo(os.pwd)}")
+    val cwd = T.dest / "workdir"
+    os.makeDir.all(cwd)
+    os.proc(bash, os.pwd / "scripts" / "test-cli.sh", path)
+      .call(cwd = cwd, stdin = os.Inherit, stdout = os.Inherit)
+  }
 }
 
 object native extends Cross[ScalaJsCliNativeImage](scalaJsVersions: _*)
@@ -331,12 +340,25 @@ object ci extends Module {
 
     Upload.upload("scala-cli", "scala-js-cli-native-image", ghToken, tag, dryRun = false, overwrite = overwriteAssets)(launchers: _*)
   }
-}
 
-def copyTo(task: mill.main.Tasks[PathRef], dest: os.Path) = T.command {
-  if (task.value.length > 1)
-    sys.error("Expected a single task")
-  val ref = task.value.head()
-  os.makeDir.all(dest / os.up)
-  os.copy.over(ref.path, dest)
+  def testCli() = {
+    val tasks = scalaJsVersions.map { scalaJsVer =>
+      cli(scalaJsVer).standaloneLauncher.map((scalaJsVer, _))
+    }
+    T.command {
+      val workDir = T.dest
+      val launchers = T.sequence(tasks)()
+      for ((scalaJsVer, launcher) <- launchers) {
+        System.err.println(s"Testing Scala.JS $scalaJsVer")
+        val cwd = workDir / scalaJsVer
+        os.makeDir.all(cwd)
+        os.proc(bash, os.pwd / "scripts" / "test-cli.sh", launcher.path)
+          .call(cwd = cwd, stdin = os.Inherit, stdout = os.Inherit)
+      }
+    }
+  }
 }
+
+private def bash =
+  if (isWin) Seq("bash.exe")
+  else Nil