Build: Ensure upstream check works even when using info logging (#23804)
The LoggedExec task does not capture output when info logging is enabled. This commit changes the upstream check to use Exec directly, so as not to break when info logging is enabled.
This commit is contained in:
parent
5a414cbe5c
commit
a903aabbd6
|
@ -35,11 +35,19 @@ task createClone(type: LoggedExec) {
|
||||||
commandLine = ['git', 'clone', rootDir, checkoutDir]
|
commandLine = ['git', 'clone', rootDir, checkoutDir]
|
||||||
}
|
}
|
||||||
|
|
||||||
task findUpstream(type: LoggedExec) {
|
// we use regular Exec here to ensure we always get output, regardless of logging level
|
||||||
|
task findUpstream(type: Exec) {
|
||||||
dependsOn createClone
|
dependsOn createClone
|
||||||
workingDir = checkoutDir
|
workingDir = checkoutDir
|
||||||
commandLine = ['git', 'remote', '-v']
|
commandLine = ['git', 'remote', '-v']
|
||||||
|
ignoreExitValue = true
|
||||||
|
ByteArrayOutputStream output = new ByteArrayOutputStream()
|
||||||
|
standardOutput = output
|
||||||
doLast {
|
doLast {
|
||||||
|
if (execResult.exitValue != 0) {
|
||||||
|
output.toString('UTF-8').eachLine { line -> logger.error(line) }
|
||||||
|
execResult.assertNormalExitValue()
|
||||||
|
}
|
||||||
project.ext.upstreamExists = false
|
project.ext.upstreamExists = false
|
||||||
output.toString('UTF-8').eachLine {
|
output.toString('UTF-8').eachLine {
|
||||||
if (it.contains("upstream")) {
|
if (it.contains("upstream")) {
|
||||||
|
|
Loading…
Reference in New Issue