Skip to content

Commit 5cb7ea4

Browse files
committed
check-build-and-verify.sh: format commands for readability and copying&pasting.
No functional changes.
1 parent 115f378 commit 5cb7ea4

File tree

1 file changed

+33
-23
lines changed

1 file changed

+33
-23
lines changed

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

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,31 @@ VERIFY_FAIL=
3333
DANGER_FAIL=
3434

3535
if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
36-
mvn --batch-mode checkstyle:check -Dcheckstyle.violationSeverity=warning >cs.log 2>&1 || CS_FAIL=yes
37-
mvn --batch-mode pmd:check >pmd.log 2>&1 || PMD_FAIL=yes
38-
mvn --batch-mode codenarc:codenarc \
39-
-Dcodenarc.maxPriority1Violations=0 \
40-
-Dcodenarc.maxPriority2Violations=0 \
41-
-Dcodenarc.maxPriority3Violations=0 \
36+
37+
mvn --batch-mode checkstyle:check -Dcheckstyle.violationSeverity=warning \
38+
>cs.log 2>&1 || CS_FAIL=yes
39+
40+
mvn --batch-mode pmd:check \
41+
>pmd.log 2>&1 || PMD_FAIL=yes
42+
43+
mvn --batch-mode codenarc:codenarc -Dcodenarc.maxPriority1Violations=0 -Dcodenarc.maxPriority2Violations=0 -Dcodenarc.maxPriority3Violations=0 \
4244
>codenarc.log 2>&1 || CODENARC_FAIL=yes
43-
mvn --batch-mode license:check >license.log 2>&1 || LICENSE_FAIL=yes
44-
mvn --batch-mode sortpom:verify -Dsort.verifyFail=stop >pom.log || POM_FAIL=yes
45-
find src -type f -name '*.html' | xargs bootlint >bootlint.log 2>&1 || BOOTLINT_FAIL=yes
46-
rflint --error=all \
47-
--ignore TooFewKeywordSteps \
48-
--ignore TooManyTestSteps \
49-
--configure LineTooLong:130 \
50-
src/test/robotframework \
45+
46+
mvn --batch-mode license:check \
47+
>license.log 2>&1 || LICENSE_FAIL=yes
48+
49+
mvn --batch-mode sortpom:verify -Dsort.verifyFail=stop \
50+
>pom.log || POM_FAIL=yes
51+
52+
find src -type f -name '*.html' | xargs bootlint \
53+
>bootlint.log 2>&1 || BOOTLINT_FAIL=yes
54+
55+
rflint --error=all --ignore TooFewKeywordSteps --ignore TooManyTestSteps --configure LineTooLong:130 src/test/robotframework \
5156
>rflint.log 2>&1 || RFLINT_FAIL=yes
52-
mvn --batch-mode jasmine:test >jasmine.log 2>&1 || JASMINE_FAIL=yes
57+
58+
mvn --batch-mode jasmine:test \
59+
>jasmine.log 2>&1 || JASMINE_FAIL=yes
60+
5361
# FIXME: add check for src/main/config/nginx/503.*html
5462
# TODO: remove ignoring of error about alt attribute after resolving #314
5563
# TODO: remove ignoring of error about document language when it will be resolved in upstream
@@ -63,18 +71,20 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
6371
'This document appears to be written in (Danish|Lithuanian)' \
6472
--show-warnings \
6573
>validator.log 2>&1 || HTML_FAIL=yes
66-
mvn --batch-mode enforcer:enforce >enforcer.log 2>&1 || ENFORCER_FAIL=yes
67-
mvn --batch-mode test \
68-
-Denforcer.skip=true \
69-
-Dmaven.resources.skip=true \
70-
-DskipMinify=true \
71-
-DdisableXmlReport=false \
74+
75+
mvn --batch-mode enforcer:enforce \
76+
>enforcer.log 2>&1 || ENFORCER_FAIL=yes
77+
78+
mvn --batch-mode test -Denforcer.skip=true -Dmaven.resources.skip=true -DskipMinify=true -DdisableXmlReport=false \
7279
>test.log 2>&1 || TEST_FAIL=yes
80+
7381
# run after tests for getting compiled sources
74-
mvn --batch-mode findbugs:check >findbugs.log 2>&1 || FINDBUGS_FAIL=yes
82+
mvn --batch-mode findbugs:check \
83+
>findbugs.log 2>&1 || FINDBUGS_FAIL=yes
7584
fi
7685

77-
mvn --batch-mode verify -Denforcer.skip=true -DskipUnitTests=true >verify-raw.log 2>&1 || VERIFY_FAIL=yes
86+
mvn --batch-mode verify -Denforcer.skip=true -DskipUnitTests=true \
87+
>verify-raw.log 2>&1 || VERIFY_FAIL=yes
7888

7989
if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
8090
danger >danger.log 2>&1 || DANGER_FAIL=yes

0 commit comments

Comments
 (0)