From f48ea3cb249e3ef692eebdddebe8e090b2f0576d Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Sat, 25 Aug 2018 21:39:39 +0200 Subject: [PATCH 1/3] Reproduce CI failure in fixing TODO See https://github.com/lampepfl/dotty/pull/4952#discussion_r212803415. --- .drone.yml | 6 +++--- sbt-dotty/sbt-test/sbt-dotty/example-project/test | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 88e6fe8e4007..b29239cef3c7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,9 +42,9 @@ pipeline: commands: - cp -R . /tmp/4/ && cd /tmp/4/ - ./project/scripts/sbt sbt-dotty/scripted - when: - # sbt scripted tests are slow and only run on nightly or deployment - event: [ tag, deployment ] + # when: + # # sbt scripted tests are slow and only run on nightly or deployment + # event: [ tag, deployment ] # DOCUMENTATION: documentation: diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/test b/sbt-dotty/sbt-test/sbt-dotty/example-project/test index c6355b638050..67f0956f4a86 100644 --- a/sbt-dotty/sbt-test/sbt-dotty/example-project/test +++ b/sbt-dotty/sbt-test/sbt-dotty/example-project/test @@ -1,4 +1,4 @@ > run > 'set initialCommands := "1 + 1" ' # FIXME: does not work on the CI -#> console +> console From 953c38428910955d8d22f8a74d33d246efc948e8 Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Sat, 25 Aug 2018 21:52:41 +0200 Subject: [PATCH 2/3] Allow dumb terminals This should probably be a setting for CI, but first testing what happens. --- compiler/src/dotty/tools/repl/JLineTerminal.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/compiler/src/dotty/tools/repl/JLineTerminal.scala b/compiler/src/dotty/tools/repl/JLineTerminal.scala index 22e44e4a5c36..7509be90d8e9 100644 --- a/compiler/src/dotty/tools/repl/JLineTerminal.scala +++ b/compiler/src/dotty/tools/repl/JLineTerminal.scala @@ -18,7 +18,6 @@ final class JLineTerminal extends java.io.Closeable { // Logger.getLogger("org.jline").setLevel(Level.FINEST) private val terminal = TerminalBuilder.builder() - .dumb(false) // fail early if not able to create a terminal .build() private val history = new DefaultHistory From 7e652308937502700f508bcc747ad7142cf0bb6c Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Sun, 26 Aug 2018 18:06:36 +0200 Subject: [PATCH 3/3] Drop fixed TODO --- sbt-dotty/sbt-test/sbt-dotty/example-project/test | 1 - 1 file changed, 1 deletion(-) diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/test b/sbt-dotty/sbt-test/sbt-dotty/example-project/test index 67f0956f4a86..885d666a4c01 100644 --- a/sbt-dotty/sbt-test/sbt-dotty/example-project/test +++ b/sbt-dotty/sbt-test/sbt-dotty/example-project/test @@ -1,4 +1,3 @@ > run > 'set initialCommands := "1 + 1" ' -# FIXME: does not work on the CI > console