Skip to content

Commit d2a2ac1

Browse files
author
user
committed
Temporary disable of OPS
1 parent 4f2ed04 commit d2a2ac1

File tree

5 files changed

+10
-31
lines changed

5 files changed

+10
-31
lines changed

core/api/src/mill/api/PathUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ trait PathUtils {
3636
implicit def substitutions(): List[(os.Path, String)] = {
3737
val out = findOutRoot()
3838

39-
var result = List((os.Path("/hom"), "*$WorkplaceRoot*"))
39+
var result = List((out, "*$WorkplaceRoot*"))
4040

4141
val javaHome = os.Path(System.getProperty("java.home"))
4242
result = result :+ (javaHome, "*$JavaHome*")

example/scalalib/web/6-webapp-scalajs-shared/build.mill

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ trait AppScalaJSModule extends AppScalaModule with ScalaJSModule {
1111

1212
object `package` extends RootModule with AppScalaModule {
1313
def moduleDeps = Seq(shared.jvm)
14-
def ivyDeps = Agg(ivy"com.lihaoyi::cask:0.9.1")
14+
def ivyDeps = Seq(ivy"com.lihaoyi::cask:0.9.1")
1515

1616
def resources = Task {
1717
os.makeDir(Task.dest / "webapp")
@@ -23,15 +23,15 @@ object `package` extends RootModule with AppScalaModule {
2323

2424
object test extends ScalaTests with TestModule.Utest {
2525

26-
def ivyDeps = Agg(
26+
def ivyDeps = Seq(
2727
ivy"com.lihaoyi::utest::0.8.5",
2828
ivy"com.lihaoyi::requests::0.6.9"
2929
)
3030
}
3131

3232
object shared extends Module {
3333
trait SharedModule extends AppScalaModule with PlatformScalaModule {
34-
def ivyDeps = Agg(
34+
def ivyDeps = Seq(
3535
ivy"com.lihaoyi::scalatags::0.13.1",
3636
ivy"com.lihaoyi::upickle::3.0.0"
3737
)
@@ -43,7 +43,7 @@ object `package` extends RootModule with AppScalaModule {
4343

4444
object client extends AppScalaJSModule {
4545
def moduleDeps = Seq(shared.js)
46-
def ivyDeps = Agg(ivy"org.scala-js::scalajs-dom::2.2.0")
46+
def ivyDeps = Seq(ivy"org.scala-js::scalajs-dom::2.2.0")
4747
}
4848
}
4949

example/thirdparty/arrow/build.mill

+2-8
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,8 @@ object `package` extends RootModule {
157157
else Task { CompilationResult(Task.dest, PathRef(Task.dest)) }
158158

159159
override def testForked(args: String*): Command[(String, Seq[TestResult])] =
160-
if (modulesWithTestingEnabled(multiplatformRoot)) {
161-
println(args)
162-
super.testForked(args: _*)
163-
}
164-
else Task.Command {
165-
println("2")
166-
("", Seq.empty[TestResult])
167-
}
160+
if (modulesWithTestingEnabled(multiplatformRoot)) super.testForked(args: _*)
161+
else Task.Command { ("", Seq.empty[TestResult]) }
168162

169163
override def sources: T[Seq[PathRef]] = Task.Sources(
170164
Seq("common", outer.platformCrossSuffix)

integration/feature/out-path-substitution/src/OutPathSubstituion.scala

+2-18
Original file line numberDiff line numberDiff line change
@@ -96,25 +96,9 @@ object OutPathTestSuite extends UtestIntegrationTestSuite {
9696
val pwd = os.pwd.toString
9797
val resReference1 = tester.eval(("runBackground"), cwd = referencePath)
9898
val resModified1 =
99-
tester.eval((s"-Duser.home=$pwd", "runBackground"), cwd = modifiedPath, env = env)
99+
tester.eval(("runBackground"), cwd = modifiedPath, env = env)
100100
assert(resModified1.isSuccess && resReference1.isSuccess)
101-
102-
val resReference2 = tester.eval(("clean", "runBackground"), cwd = referencePath)
103-
val resModified2 =
104-
tester.eval((s"-Duser.home=$pwd", "clean", "runBackground"), cwd = modifiedPath, env = env)
105-
assert(resModified2.isSuccess && resReference2.isSuccess)
106-
107-
val resReference3 = tester.eval(("jar"), cwd = referencePath)
108-
val resModified3 = tester.eval((s"-Duser.home=$pwd", "jar"), cwd = modifiedPath, env = env)
109-
assert(resModified3.isSuccess && resReference3.isSuccess)
110-
111-
val resReference4 = tester.eval(("assembly"), cwd = referencePath)
112-
val resModified4 =
113-
tester.eval((s"-Duser.home=$pwd", "assembly"), cwd = modifiedPath, env = env)
114-
assert(resModified4.isSuccess && resReference4.isSuccess)
115-
116-
assert(os.exists(os.home / "https"))
117-
}
101+
}
118102

119103
test("Compare") - integrationTest { tester =>
120104

runner/client/src/mill/runner/client/MillProcessLauncher.java

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ static Process configureRunMillProcess(ProcessBuilder builder, Path serverDir) t
7373
Path sandbox = serverDir.resolve(ServerFiles.sandbox);
7474
Files.createDirectories(sandbox);
7575
builder.environment().put(EnvVars.MILL_WORKSPACE_ROOT, new File("").getCanonicalPath());
76+
builder.environment().put("java.test", "test");
7677

7778
String jdkJavaOptions = System.getenv("JDK_JAVA_OPTIONS");
7879
if (jdkJavaOptions == null) jdkJavaOptions = "";

0 commit comments

Comments
 (0)