Don't require a publishLocal to run ITs

Author: alexarchambault

.github/workflows/ci.yml

@@ -84,11 +84,9 @@ jobs:
         with:
           jvm: "zulu:17"
       - run: |
-          ./mill -i __.publishLocal &&\
           ./mill -i integration.test.jvm
         if: runner.os != 'Windows'
       - run: |
-          @call ./mill.bat -i __.publishLocal
           @call ./mill.bat -i integration.test.jvm
         shell: cmd
         if: runner.os == 'Windows'
@@ -127,11 +125,9 @@ jobs:
           if-no-files-found: error
           retention-days: 1
       - run: |
-          ./mill -i __.publishLocal &&\
           ./mill -i "integration.test.native"
         if: github.event_name == 'push' && runner.os != 'Windows'
       - run: |
-          ./mill.bat -i __.publishLocal
           ./mill.bat -i integration.test.native
         if: github.event_name == 'push' && runner.os == 'Windows'
         shell: bash

build.sc

@@ -19,6 +19,8 @@ object Dependencies {
 
   def scalaVersions = Seq(scala212, scala213)
 
+  def serverScalaVersion = scala212
+
   def asmVersion         = "9.6"
   def coursierVersion    = "2.1.0-M6-53-gb4f448130"
   def graalvmVersion     = "22.2.0"
@@ -532,8 +534,8 @@ object `bloop-rifle` extends BloopCliModule {
          |
          |/** Build-time constants. Generated by mill. */
          |object Constants {
-         |  def bloopVersion = "${frontend(Dependencies.scala212).publishVersion()}"
-         |  def bloopScalaVersion = "${Dependencies.scala212}"
+         |  def bloopVersion = "${frontend(Dependencies.serverScalaVersion).publishVersion()}"
+         |  def bloopScalaVersion = "${Dependencies.serverScalaVersion}"
          |  def bspVersion = "${Dependencies.bsp4j.dep.version}"
          |}
          |""".stripMargin
@@ -607,6 +609,19 @@ object integration extends BloopCliModule {
       Dependencies.pprint
     )
 
+    private def repoRoot = os.pwd / "out" / "repo"
+    def localRepo = T {
+      val modules = Seq(
+        frontend(Dependencies.serverScalaVersion),
+        backend(Dependencies.serverScalaVersion),
+        shared(Dependencies.serverScalaVersion)
+      )
+      os.remove.all(repoRoot)
+      os.makeDir.all(repoRoot)
+      val tasks = modules.map(_.publishLocalNoFluff(repoRoot.toString))
+      define.Target.sequence(tasks)
+    }
+
     def forkEnv = super.forkEnv() ++ Seq(
       "BLOOP_CLI_TESTS_TMP_DIR" -> tmpDir()
     )
@@ -615,8 +630,10 @@ object integration extends BloopCliModule {
       def test(args: String*) = {
         val argsTask = T.task {
           val launcher = launcherTask().path
+          localRepo()
           val extraArgs = Seq(
-            s"-Dtest.bloop-cli.path=$launcher"
+            s"-Dtest.bloop-cli.path=$launcher",
+            s"-Dtest.bloop-cli.repo=$repoRoot"
           )
           args ++ extraArgs
         }

integration/test/src/bloop/cli/integration/BloopCliTests.scala

@@ -9,22 +9,21 @@ class BloopCliTests extends munit.FunSuite {
       val dirArgs = Seq[os.Shellable]("--daemon-dir", root / "daemon")
 
       os.proc(Launcher.launcher, "exit", dirArgs)
-        .call(cwd = root)
+        .call(cwd = root, stdin = os.Inherit, stdout = os.Inherit)
       val statusCheck0 = os.proc(Launcher.launcher, "status", dirArgs)
         .call(cwd = root)
         .out.trim()
       expect(statusCheck0 == "stopped")
 
-      val res = os.proc(Launcher.launcher, dirArgs, "about")
-        .call(cwd = root)
-      expect(res.out.text().startsWith("bloop v"))
+      os.proc(Launcher.launcher, dirArgs, "about")
+        .call(cwd = root, stdin = os.Inherit, stdout = os.Inherit, env = Launcher.extraEnv)
       val statusCheck1 = os.proc(Launcher.launcher, "status", dirArgs)
         .call(cwd = root)
         .out.trim()
       expect(statusCheck1 == "running")
 
       os.proc(Launcher.launcher, "exit", dirArgs)
-        .call(cwd = root)
+        .call(cwd = root, stdin = os.Inherit, stdout = os.Inherit)
       val statusCheck2 = os.proc(Launcher.launcher, "status", dirArgs)
         .call(cwd = root)
         .out.trim()

integration/test/src/bloop/cli/integration/Launcher.scala

@@ -7,4 +7,14 @@ object Launcher {
     sys.error("test.bloop-cli.path not set")
   )
 
+  lazy val repoRoot = os.Path(sys.props.getOrElse(
+    "test.bloop-cli.repo",
+    sys.error("test.bloop-cli.repo not set")
+  ))
+
+  lazy val extraEnv =
+    Map(
+      "COURSIER_REPOSITORIES" -> s"ivy:${repoRoot.toNIO.toUri.toASCIIString}/[defaultPattern]|ivy2Local|central"
+    )
+
 }