Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Oct 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df06d7
Use project root as `T.workspace` also in meta-build
lolgab Oct 2, 2023
91676d1
Rename `projectRoot` to `workspace`
lolgab Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions main/eval/src/mill/eval/EvaluatorImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion main/eval/src/mill/eval/GroupEvaluator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions main/testkit/src/mill/testkit/MillTestkit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ trait MillTestKit {
}
val evaluator = mill.eval.EvaluatorImpl(
mill.api.Ctx.defaultHome,
module.millSourcePath,
outPath,
outPath,
module,
Expand Down
1 change: 1 addition & 0 deletions runner/src/mill/runner/MillBuildBootstrap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ class MillBuildBootstrap(

mill.eval.EvaluatorImpl(
home,
projectRoot,
recOut(projectRoot, depth),
recOut(projectRoot, depth),
rootModule,
Expand Down