Skip to content

Commit 7dca59c

Browse files
committed
check-build-and-verify.sh: show result of running danger.
1 parent f0db775 commit 7dca59c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/main/scripts/ci/check-build-and-verify.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ fi
6464

6565
mvn --batch-mode verify -Denforcer.skip=true -DskipUnitTests=true >verify-raw.log 2>&1 || VERIFY_FAIL=yes
6666

67+
if [ "$SPRING_PROFILES_ACTIVE" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
68+
danger >danger.log 2>&1 || DANGER_FAIL=yes
69+
fi
70+
6771
# Workaround for #538
6872
"$(dirname "$0")/filter-out-htmlunit-messages.pl" <verify-raw.log >verify.log
6973

@@ -87,6 +91,7 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
8791
fi
8892

8993
print_status "$VERIFY_FAIL" 'Run integration tests'
94+
print_status "$DANGER_FAIL" 'Run danger'
9095

9196
echo
9297

@@ -105,12 +110,8 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
105110
print_log findbugs.log 'Run FindBugs'
106111
fi
107112

108-
print_log verify.log 'Run integration tests'
109-
110-
if [ "$SPRING_PROFILES_ACTIVE" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
111-
# danger uses log files and it should be run before these files will be cleaned
112-
danger || DANGER_FAIL=yes
113-
fi
113+
print_log verify.log 'Run integration tests'
114+
print_log danger.log 'Run danger'
114115

115116
# In order to be able debug robot framework test flakes we need to have a report.
116117
# Just encode it to a binary form and dump to console.
@@ -120,7 +121,7 @@ if fgrep -qs 'status="FAIL"' target/robotframework-reports/output.xml; then
120121
echo "===== REPORT END ====="
121122
fi
122123

123-
rm -f cs.log pmd.log codenarc.log license.log pom.log bootlint.log rflint.log jasmine.log validator.log enforcer.log test.log findbugs.log verify-raw.log verify.log
124+
rm -f cs.log pmd.log codenarc.log license.log pom.log bootlint.log rflint.log jasmine.log validator.log enforcer.log test.log findbugs.log verify-raw.log verify.log danger.log
124125

125126
if [ -n "$CS_FAIL$PMD_FAIL$CODENARC_FAIL$LICENSE_FAIL$POM_FAIL$BOOTLINT_FAIL$RFLINT_FAIL$JASMINE_FAIL$HTML_FAIL$ENFORCER_FAIL$TEST_FAIL$FINDBUGS_FAIL$VERIFY_FAIL$DANGER_FAIL" ]; then
126127
exit 1

0 commit comments

Comments
 (0)