Use project root as T.workspace also in meta-build (#2809)

Fixes #2802 Pull request: #2809
com-lihaoyi · Oct 2, 2023 · 1a7e758 · 1a7e758
1 parent 7c2114e
commit 1a7e758
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/main/eval/src/mill/eval/EvaluatorImpl.scala b/main/eval/src/mill/eval/EvaluatorImpl.scala
@@ -14,6 +14,7 @@ import scala.reflect.ClassTag
  */
 private[mill] case class EvaluatorImpl(
     home: os.Path,
+    workspace: os.Path,
     outPath: os.Path,
     externalOutPath: os.Path,
     rootModule: mill.define.BaseModule,

diff --git a/main/eval/src/mill/eval/GroupEvaluator.scala b/main/eval/src/mill/eval/GroupEvaluator.scala
@@ -18,6 +18,7 @@ import scala.util.control.NonFatal
  */
 private[mill] trait GroupEvaluator {
   def home: os.Path
+  def workspace: os.Path
   def outPath: os.Path
   def externalOutPath: os.Path
   def rootModule: mill.define.BaseModule
@@ -299,7 +300,7 @@ private[mill] trait GroupEvaluator {
               env = env,
               reporter = reporter,
               testReporter = testReporter,
-              workspace = rootModule.millSourcePath
+              workspace = workspace
             ) with mill.api.Ctx.Jobs {
               override def jobs: Int = effectiveThreadCount
             }

diff --git a/main/testkit/src/mill/testkit/MillTestkit.scala b/main/testkit/src/mill/testkit/MillTestkit.scala
@@ -94,6 +94,7 @@ trait MillTestKit {
     }
     val evaluator = mill.eval.EvaluatorImpl(
       mill.api.Ctx.defaultHome,
+      module.millSourcePath,
       outPath,
       outPath,
       module,

diff --git a/runner/src/mill/runner/MillBuildBootstrap.scala b/runner/src/mill/runner/MillBuildBootstrap.scala
@@ -338,6 +338,7 @@ class MillBuildBootstrap(
 
     mill.eval.EvaluatorImpl(
       home,
+      projectRoot,
       recOut(projectRoot, depth),
       recOut(projectRoot, depth),
       rootModule,