فهرست منبع

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.
Ryan Ernst 8 سال پیش
والد
کامیت
a903aabbd6
1فایلهای تغییر یافته به همراه9 افزوده شده و 1 حذف شده
  1. 9 1
      distribution/bwc-zip/build.gradle

+ 9 - 1
distribution/bwc-zip/build.gradle

@@ -35,11 +35,19 @@ task createClone(type: LoggedExec) {
   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
   workingDir = checkoutDir
   commandLine = ['git', 'remote', '-v']
+  ignoreExitValue = true
+  ByteArrayOutputStream output = new ByteArrayOutputStream()
+  standardOutput = output
   doLast {
+    if (execResult.exitValue != 0) {
+      output.toString('UTF-8').eachLine { line -> logger.error(line) }
+      execResult.assertNormalExitValue()
+    }
     project.ext.upstreamExists = false
     output.toString('UTF-8').eachLine {
       if (it.contains("upstream")) {