diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-19 03:12:15 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-19 10:49:22 -0800 |
commit | 225ace260f614deb74c8770608c4c9109d336bba (patch) | |
tree | 3d50c0d165e9d5be2ced4760cea4ac487badba46 /build.sbt | |
parent | 4e6a81f65413a973223627d406564c2bf4351c1e (diff) | |
download | mill-225ace260f614deb74c8770608c4c9109d336bba.tar.gz mill-225ace260f614deb74c8770608c4c9109d336bba.tar.bz2 mill-225ace260f614deb74c8770608c4c9109d336bba.zip |
Get Travis CI green again after adding Ammonite integration test
Diffstat (limited to 'build.sbt')
-rw-r--r-- | build.sbt | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,7 @@ import java.io.File +parallelExecution := false + val sharedSettings = Seq( scalaVersion := "2.12.4", organization := "com.lihaoyi", @@ -7,6 +9,7 @@ val sharedSettings = Seq( testFrameworks += new TestFramework("mill.UTestFramework"), + parallelExecution in Test := false, test in assembly := {}, @@ -238,11 +241,12 @@ lazy val bin = project mainClass in (Test, run) := Some("mill.Main"), baseDirectory in (Test, run) := (baseDirectory in (Compile, run)).value / ".." / "..", assemblyOption in assembly := { + val extraArgs = (bridgeProps.value ++ jsbridgeProps.value).mkString(" ") (assemblyOption in assembly).value.copy( prependShellScript = Some( Seq( "#!/usr/bin/env sh", - s"""exec java ${(bridgeProps.value ++ jsbridgeProps.value).mkString(" ")} -cp "$$0" mill.Main "$$@" """ + s"""exec java $extraArgs $$JAVA_OPTS -cp "$$0" mill.Main "$$@" """ ) ) ) |