@@ -17,6 +17,7 @@ object DottyBuild extends Build {
17
17
val jenkinsMemLimit = List (" -Xmx1500m" )
18
18
19
19
val JENKINS_BUILD = " dotty.jenkins.build"
20
+ val DRONE_MEM = " dotty.drone.mem"
20
21
21
22
val scalaCompiler = " me.d-d" % " scala-compiler" % " 2.11.5-20160322-171045-e19b30b3cd"
22
23
@@ -335,9 +336,11 @@ object DottyBuild extends Build {
335
336
path.contains(" sbt-interface" )
336
337
} yield " -Xbootclasspath/p:" + path
337
338
338
- val travis_build = // propagate if this is a travis build
339
+ val ci_build = // propagate if this is a ci build
339
340
if (sys.props.isDefinedAt(JENKINS_BUILD ))
340
341
List (s " -D $JENKINS_BUILD= ${sys.props(JENKINS_BUILD )}" ) ::: jenkinsMemLimit
342
+ else if (sys.props.isDefinedAt(DRONE_MEM ))
343
+ List (" -Xmx" + sys.props(DRONE_MEM ))
341
344
else List ()
342
345
343
346
val tuning =
@@ -346,7 +349,7 @@ object DottyBuild extends Build {
346
349
List (" -XX:+TieredCompilation" , " -XX:TieredStopAtLevel=1" )
347
350
else List ()
348
351
349
- (" -DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: path.toList
352
+ (" -DpartestParentID=" + pid) :: tuning ::: agentOptions ::: ci_build ::: path.toList
350
353
}
351
354
).
352
355
settings(publishing)
@@ -530,12 +533,14 @@ object DottyInjectedPlugin extends AutoPlugin {
530
533
val fullpath = (" -Xbootclasspath/a:" + bin) :: path.toList
531
534
// System.err.println("BOOTPATH: " + fullpath)
532
535
533
- val travis_build = // propagate if this is a travis build
536
+ val ci_build = // propagate if this is a ci build
534
537
if (sys.props.isDefinedAt(JENKINS_BUILD ))
535
538
List (s " -D $JENKINS_BUILD= ${sys.props(JENKINS_BUILD )}" )
539
+ else if (sys.props.isDefinedAt(DRONE_MEM ))
540
+ List (" -Xmx" + sys.props(DRONE_MEM ))
536
541
else
537
542
List ()
538
- val res = agentOptions ::: travis_build ::: fullpath
543
+ val res = agentOptions ::: ci_build ::: fullpath
539
544
println(" Running with javaOptions: " + res)
540
545
res
541
546
}
0 commit comments