diff --git a/build.mill b/build.mill index 8a82fc056b..37146e586f 100644 --- a/build.mill +++ b/build.mill @@ -132,7 +132,7 @@ object benchmark extends Cross[BenchmarkModule](build.scalaVersions) with RunMod println(s"Waiting for server to start..., vt:$vt") if (!waitForServer(url)) { serverApp.destroy() - println("Failed to start regular server") + println("Failed to start server") sys.exit(1) } @@ -144,7 +144,7 @@ object benchmark extends Cross[BenchmarkModule](build.scalaVersions) with RunMod ).call(stderr = os.Pipe) serverApp.destroy() - println(s"\nResults with $vt:") + println(s"""\nResults with ${if (vt) "(virtual threads)" else "(platform threads)"}:""") println(results.out.text()) } diff --git a/example/minimalApplicationWithLoom/package.mill b/example/minimalApplicationWithLoom/package.mill index 791d8f494b..2fbec57747 100644 --- a/example/minimalApplicationWithLoom/package.mill +++ b/example/minimalApplicationWithLoom/package.mill @@ -10,14 +10,12 @@ trait AppModule extends CrossScalaModule{ argsStr.split(" ").filter(_.nonEmpty).toSeq } - def forkArgs = T { + def forkArgs = Task.Input { //TODO not sure why the env passing is not working - val envVirtualThread: String = T.env.getOrElse("CASK_VIRTUAL_THREAD", "null") + val envVirtualThread: String = T.env.getOrElse("CASK_VIRTUAL_THREAD", "false") println("envVirtualThread: " + envVirtualThread) - val systemProps = if (envVirtualThread == "true") { - Seq("-Dcask.virtual-thread.enabled=true") - } else Nil + val systemProps = Seq(s"-Dcask.virtual-thread.enabled=$envVirtualThread") val baseArgs = Seq( "--add-opens", "java.base/java.lang=ALL-UNNAMED" diff --git a/example/staticFilesWithLoom/package.mill b/example/staticFilesWithLoom/package.mill index b7292d584e..37e5452aba 100644 --- a/example/staticFilesWithLoom/package.mill +++ b/example/staticFilesWithLoom/package.mill @@ -15,14 +15,12 @@ trait AppModule extends CrossScalaModule{ app => argsStr.split(" ").filter(_.nonEmpty).toSeq } - def forkArgs = T { + def forkArgs = Task.Input { //TODO not sure why the env passing is not working - val envVirtualThread: String = T.env.getOrElse("CASK_VIRTUAL_THREAD", "null") + val envVirtualThread: String = T.env.getOrElse("CASK_VIRTUAL_THREAD", "false") println("envVirtualThread: " + envVirtualThread) - val systemProps = if (envVirtualThread == "true") { - Seq("-Dcask.virtual-thread.enabled=true") - } else Nil + val systemProps = Seq(s"-Dcask.virtual-thread.enabled=$envVirtualThread") val baseArgs = Seq( "--add-opens", "java.base/java.lang=ALL-UNNAMED" diff --git a/example/todoDbWithLoom/package.mill b/example/todoDbWithLoom/package.mill index bb829eaa19..db93619474 100644 --- a/example/todoDbWithLoom/package.mill +++ b/example/todoDbWithLoom/package.mill @@ -9,14 +9,12 @@ trait AppModule extends CrossScalaModule{ argsStr.split(" ").filter(_.nonEmpty).toSeq } - def forkArgs = T { + def forkArgs = Task.Input { //TODO not sure why the env passing is not working - val envVirtualThread: String = T.env.getOrElse("CASK_VIRTUAL_THREAD", "null") + val envVirtualThread: String = T.env.getOrElse("CASK_VIRTUAL_THREAD", "false") println("envVirtualThread: " + envVirtualThread) - val systemProps = if (envVirtualThread == "true") { - Seq("-Dcask.virtual-thread.enabled=true") - } else Nil + val systemProps = Seq(s"-Dcask.virtual-thread.enabled=$envVirtualThread") val baseArgs = Seq( "--add-opens", "java.base/java.lang=ALL-UNNAMED"