Krinkle has submitted this change and it was merged.

Change subject: jsduck: Use new jsduck --color and --warnings-exit-nonzero 
option
......................................................................


jsduck: Use new jsduck --color and --warnings-exit-nonzero option

Change-Id: I5cee1cf364e98c5424827223e40db63dfd1ebaf7
---
M macro.yaml
1 file changed, 3 insertions(+), 13 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/macro.yaml b/macro.yaml
index 4e24651..68bbde0 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -70,20 +70,10 @@
      - shell: |
         #!/bin/bash
         echo "Running JSDuck with {config}..."
-        warnings=`jsduck --config="{config}" 2>&1`
-        code=$?
-        # Re-colorize
-        export TERM=xterm
-        BLACK=$(tput setaf 0); YELLOW=$(tput setaf 3); MEGANTA=$(tput setaf 5)
-        echo "$warnings" | perl -pe "s|^([^ ]+) ([^ ]+) (.*)$|$YELLOW\1 
$MEGANTA\2 $BLACK\3|"
-        # JSDuck doesn't exit with an error code if there are warnings
-        if [[ "$code" == "0" && "$warnings" != "" ]]
-        then
-            echo
-            exit 1
-        fi
+        jsduck --config="{config}" --color --warnings-exit-nonzero
+        ec=$?
         # Exit with exit code of jsduck command
-        exit $code
+        exit $ec
 
 - builder:
     name: qunit

-- 
To view, visit https://gerrit.wikimedia.org/r/62023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5cee1cf364e98c5424827223e40db63dfd1ebaf7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to