Skip to content

Commit f99d15b

Browse files
authored
Merge pull request #338 from scala/backport-lts-3.3-22840
Backport "chore: remove old drone configuration (dead-code)" to 3.3 LTS
2 parents 28f63c5 + e6a57d0 commit f99d15b

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ object CommunityBuildRunner:
1313
* is necessary since we run tests each time on a fresh
1414
* Docker container. We run the update on Docker container
1515
* creation time to create the cache of the dependencies
16-
* and avoid network overhead. See https://github.com/lampepfl/dotty-drone
17-
* for more infrastructural details.
16+
* and avoid network overhead.
1817
*/
1918
extension (self: CommunityProject)
2019
def run()(using suite: CommunityBuildRunner): Unit =

compiler/test/dotty/Properties.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ object Properties {
1919

2020
/** Are we running on the CI? */
2121
val isRunByCI: Boolean = sys.env.isDefinedAt("DOTTY_CI_RUN")
22-
|| sys.env.isDefinedAt("DRONE") // TODO remove this when we drop Drone
2322

2423
val testCache: Path =
2524
sys.env.get("DOTTY_TEST_CACHE").map(Paths.get(_)).getOrElse {

compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object VulpixUnitTests extends ParallelTesting {
105105
def maxDuration = 3.seconds
106106
def numberOfSlaves = 5
107107
def safeMode = sys.env.get("SAFEMODE").isDefined
108-
def isInteractive = !sys.env.contains("DRONE")
108+
def isInteractive = !sys.env.contains("DOTTY_CI_RUN")
109109
def testFilter = Nil
110110
def updateCheckFiles: Boolean = false
111111
def failedTests = None

project/Build.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -292,15 +292,8 @@ object Build {
292292
PgpKeys.pgpPassphrase := sys.env.get("PGP_PW").map(_.toCharArray()),
293293
PgpKeys.useGpgPinentry := true,
294294

295-
javaOptions ++= {
296-
val ciOptions = // propagate if this is a CI build
297-
sys.props.get("dotty.drone.mem") match {
298-
case Some(prop) => List("-Xmx" + prop)
299-
case _ => List()
300-
}
301-
// Do not cut off the bottom of large stack traces (default is 1024)
302-
"-XX:MaxJavaStackTraceDepth=1000000" :: agentOptions ::: ciOptions
303-
},
295+
// Do not cut off the bottom of large stack traces (default is 1024)
296+
javaOptions ++= "-XX:MaxJavaStackTraceDepth=1000000" :: agentOptions,
304297

305298
excludeLintKeys ++= Set(
306299
// We set these settings in `commonSettings`, if a project

0 commit comments

Comments
 (0)