luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6067 from eatkins/sbt-ci 

Fix console with -Dsbt.ci=true
This commit is contained in:
eugene yokota 2020-11-06 17:40:19 -05:00 committed by GitHub
parent 031d2c6655 c1fcf5c531
commit e3131a8205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -334,11 +334,11 @@ object Terminal {
* @tparam T the result type of the thunk * @tparam T the result type of the thunk
* @return the result of the thunk * @return the result of the thunk
*/ */
private[sbt] def withStreams[T](isServer: Boolean)(f: => T): T = private[sbt] def withStreams[T](isServer: Boolean)(f: => T): T = {
// In ci environments, don't touch the io streams unless run with -Dsbt.io.virtual=true // In ci environments, don't touch the io streams unless run with -Dsbt.io.virtual=true
if (hasConsole && !isDumbTerminal) consoleTerminalHolder.set(newConsoleTerminal())
if (System.getProperty("sbt.io.virtual", "") == "true" || !isCI) { if (System.getProperty("sbt.io.virtual", "") == "true" || !isCI) {
hasProgress.set(isServer && isAnsiSupported) hasProgress.set(isServer && isAnsiSupported)
if (hasConsole && !isDumbTerminal) consoleTerminalHolder.set(newConsoleTerminal())
activeTerminal.set(consoleTerminalHolder.get) activeTerminal.set(consoleTerminalHolder.get)
try withOut(withIn(f)) try withOut(withIn(f))
finally { finally {
@ -372,6 +372,7 @@ object Terminal {
} }
} }
} else f } else f
}
private[this] object ProxyTerminal extends Terminal { private[this] object ProxyTerminal extends Terminal {
private def t: Terminal = activeTerminal.get private def t: Terminal = activeTerminal.get
@ -1006,17 +1007,8 @@ object Terminal {
} }
private[sbt] object NullTerminal extends DefaultTerminal private[sbt] object NullTerminal extends DefaultTerminal
private[sbt] object SimpleTerminal extends DefaultTerminal { private[sbt] object SimpleTerminal extends DefaultTerminal {
override lazy val inputStream: InputStream = override lazy val inputStream: InputStream = originalIn
if (isCI) BlockingInputStream
else originalIn
override lazy val outputStream: OutputStream = originalOut override lazy val outputStream: OutputStream = originalOut
override lazy val errorStream: OutputStream = originalErr override lazy val errorStream: OutputStream = originalErr
} }
private[this] object BlockingInputStream extends SimpleInputStream {
override def read(): Int = {
try this.synchronized(this.wait)
catch { case _: InterruptedException => }
-1
}
}
} }