Properly propagate exit codes from server output to client

2 files changed, 3 insertions, 3 deletions

diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala
index 482de0bf..d6a908d3 100644
--- a/main/src/mill/Main.scala
+++ b/main/src/mill/Main.scala
@@ -48,7 +48,7 @@ object ClientMain {
       .start()
   }
   def main(args: Array[String]): Unit = {
-    Client.WithLock(1) { lockBase =>
+    val exitCode = Client.WithLock(1) { lockBase =>
       val c = new Client(
         lockBase,
         () => initServer(lockBase),
@@ -59,7 +59,7 @@ object ClientMain {
       )
       c.run(args)
     }
-    System.exit(0)
+    System.exit(exitCode)
   }
 }
 object ServerMain extends mill.clientserver.ServerMain[Evaluator.State]{
diff --git a/main/test/src/mill/util/ScriptTestSuite.scala b/main/test/src/mill/util/ScriptTestSuite.scala
index 1f89ab8d..6bc96540 100644
--- a/main/test/src/mill/util/ScriptTestSuite.scala
+++ b/main/test/src/mill/util/ScriptTestSuite.scala
@@ -21,7 +21,7 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{
     if (!fork) runner.runScript(workspacePath / "build.sc", s.toList)
     else{
       try {
-        %%(home / "mill-release", s)(workspacePath)
+        %%(home / "mill-release", "-i", s)(workspacePath)
         true
       }catch{case e: Throwable => false}
     }