jenkins-bot has submitted this change and it was merged. Change subject: jsduck: Remove redundant hack that searched jsduck.log for "Warning" ......................................................................
jsduck: Remove redundant hack that searched jsduck.log for "Warning" Follows-up a4db3e7a37, e7a940d94b. When we added --processes=0, this hack became redundant since the upstream issue with exit codes only applies to parallel execution on old Ruby versions. As long as we run the old Ruby (bug 60138) we'll have processes=0, and when we upgrade, the exitcode bug isn't there and we'll remove processes=0. Bug: 55668 Change-Id: I1e226492d5313e28d851d71d04771fd84bd66af8 --- M jjb/macro.yaml 1 file changed, 1 insertion(+), 16 deletions(-) Approvals: Krinkle: Looks good to me, approved JanZerebecki: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/jjb/macro.yaml b/jjb/macro.yaml index f108f7b..2a12bbc 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -276,22 +276,7 @@ else version="unknown" fi - set -o pipefail - jsduck --config="{config}" --footer="Generated for branch ${{version}} on {{DATE}} by {{JSDUCK}} {{VERSION}}." --processes 0 --warnings-exit-nonzero 2>&1 | tee jsduck.log - ec=$? - if [[ $ec -eq 0 ]] - then - set +e - grep "^Warning:" jsduck.log > /dev/null - gr=$? - set -e - if [[ $gr -eq 0 ]] - then - ec=1 - fi - fi - # Exit with exit code of jsduck command, or whether we found errors - exit $ec + jsduck --config="{config}" --footer="Generated for branch ${{version}} on {{DATE}} by {{JSDUCK}} {{VERSION}}." --processes 0 --warnings-exit-nonzero - builder: name: jsduck -- To view, visit https://gerrit.wikimedia.org/r/174619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e226492d5313e28d851d71d04771fd84bd66af8 Gerrit-PatchSet: 5 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits