Skip to content

Commit 4840a4b

Browse files
committed
check-build-and-verify.sh: rename variables to reflect their meaning.
No functional changes.
1 parent 0cfd85c commit 4840a4b

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,46 @@ fi
1717

1818
. "$(dirname "$0")/common.sh"
1919

20-
CS_FAIL=
21-
PMD_FAIL=
22-
CODENARC_FAIL=
23-
LICENSE_FAIL=
24-
POM_FAIL=
25-
BOOTLINT_FAIL=
26-
RFLINT_FAIL=
27-
JASMINE_FAIL=
28-
HTML_FAIL=
29-
ENFORCER_FAIL=
30-
TEST_FAIL=
31-
FINDBUGS_FAIL=
32-
VERIFY_FAIL=
33-
DANGER_FAIL=
20+
CS_STATUS=
21+
PMD_STATUS=
22+
CODENARC_STATUS=
23+
LICENSE_STATUS=
24+
POM_STATUS=
25+
BOOTLINT_STATUS=
26+
RFLINT_STATUS=
27+
JASMINE_STATUS=
28+
HTML_STATUS=
29+
ENFORCER_STATUS=
30+
TEST_STATUS=
31+
FINDBUGS_STATUS=
32+
VERIFY_STATUS=
33+
DANGER_STATUS=
3434

3535
if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
3636

3737
mvn --batch-mode checkstyle:check -Dcheckstyle.violationSeverity=warning \
38-
>cs.log 2>&1 || CS_FAIL=fail
38+
>cs.log 2>&1 || CS_STATUS=fail
3939

4040
mvn --batch-mode pmd:check \
41-
>pmd.log 2>&1 || PMD_FAIL=fail
41+
>pmd.log 2>&1 || PMD_STATUS=fail
4242

4343
mvn --batch-mode codenarc:codenarc -Dcodenarc.maxPriority1Violations=0 -Dcodenarc.maxPriority2Violations=0 -Dcodenarc.maxPriority3Violations=0 \
44-
>codenarc.log 2>&1 || CODENARC_FAIL=fail
44+
>codenarc.log 2>&1 || CODENARC_STATUS=fail
4545

4646
mvn --batch-mode license:check \
47-
>license.log 2>&1 || LICENSE_FAIL=fail
47+
>license.log 2>&1 || LICENSE_STATUS=fail
4848

4949
mvn --batch-mode sortpom:verify -Dsort.verifyFail=stop \
50-
>pom.log || POM_FAIL=fail
50+
>pom.log || POM_STATUS=fail
5151

5252
find src -type f -name '*.html' | xargs bootlint \
53-
>bootlint.log 2>&1 || BOOTLINT_FAIL=fail
53+
>bootlint.log 2>&1 || BOOTLINT_STATUS=fail
5454

5555
rflint --error=all --ignore TooFewKeywordSteps --ignore TooManyTestSteps --configure LineTooLong:130 src/test/robotframework \
56-
>rflint.log 2>&1 || RFLINT_FAIL=fail
56+
>rflint.log 2>&1 || RFLINT_STATUS=fail
5757

5858
mvn --batch-mode jasmine:test \
59-
>jasmine.log 2>&1 || JASMINE_FAIL=fail
59+
>jasmine.log 2>&1 || JASMINE_STATUS=fail
6060

6161
# FIXME: add check for src/main/config/nginx/503.*html
6262
# TODO: remove ignoring of error about alt attribute after resolving #314
@@ -70,24 +70,24 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
7070
'The first child "option" element of a "select" element with a "required" attribute' \
7171
'This document appears to be written in (Danish|Lithuanian)' \
7272
--show-warnings \
73-
>validator.log 2>&1 || HTML_FAIL=fail
73+
>validator.log 2>&1 || HTML_STATUS=fail
7474

7575
mvn --batch-mode enforcer:enforce \
76-
>enforcer.log 2>&1 || ENFORCER_FAIL=fail
76+
>enforcer.log 2>&1 || ENFORCER_STATUS=fail
7777

7878
mvn --batch-mode test -Denforcer.skip=true -Dmaven.resources.skip=true -DskipMinify=true -DdisableXmlReport=false \
79-
>test.log 2>&1 || TEST_FAIL=fail
79+
>test.log 2>&1 || TEST_STATUS=fail
8080

8181
# run after tests for getting compiled sources
8282
mvn --batch-mode findbugs:check \
83-
>findbugs.log 2>&1 || FINDBUGS_FAIL=fail
83+
>findbugs.log 2>&1 || FINDBUGS_STATUS=fail
8484
fi
8585

8686
mvn --batch-mode verify -Denforcer.skip=true -DskipUnitTests=true \
87-
>verify-raw.log 2>&1 || VERIFY_FAIL=fail
87+
>verify-raw.log 2>&1 || VERIFY_STATUS=fail
8888

8989
if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
90-
danger >danger.log 2>&1 || DANGER_FAIL=fail
90+
danger >danger.log 2>&1 || DANGER_STATUS=fail
9191
fi
9292

9393
# Workaround for #538
@@ -98,24 +98,24 @@ echo 'Build summary:'
9898
echo
9999

100100
if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
101-
print_status "$CS_FAIL" 'Run CheckStyle'
102-
print_status "$PMD_FAIL" 'Run PMD'
103-
print_status "$CODENARC_FAIL" 'Run CodeNarc'
104-
print_status "$LICENSE_FAIL" 'Check license headers'
105-
print_status "$POM_FAIL" 'Check sorting of pom.xml'
106-
print_status "$BOOTLINT_FAIL" 'Run bootlint'
107-
print_status "$RFLINT_FAIL" 'Run robot framework lint'
108-
print_status "$JASMINE_FAIL" 'Run JavaScript unit tests'
109-
print_status "$HTML_FAIL" 'Run html5validator'
110-
print_status "$ENFORCER_FAIL" 'Run maven-enforcer-plugin'
111-
print_status "$TEST_FAIL" 'Run unit tests'
112-
print_status "$FINDBUGS_FAIL" 'Run FindBugs'
101+
print_status "$CS_STATUS" 'Run CheckStyle'
102+
print_status "$PMD_STATUS" 'Run PMD'
103+
print_status "$CODENARC_STATUS" 'Run CodeNarc'
104+
print_status "$LICENSE_STATUS" 'Check license headers'
105+
print_status "$POM_STATUS" 'Check sorting of pom.xml'
106+
print_status "$BOOTLINT_STATUS" 'Run bootlint'
107+
print_status "$RFLINT_STATUS" 'Run robot framework lint'
108+
print_status "$JASMINE_STATUS" 'Run JavaScript unit tests'
109+
print_status "$HTML_STATUS" 'Run html5validator'
110+
print_status "$ENFORCER_STATUS" 'Run maven-enforcer-plugin'
111+
print_status "$TEST_STATUS" 'Run unit tests'
112+
print_status "$FINDBUGS_STATUS" 'Run FindBugs'
113113
fi
114114

115-
print_status "$VERIFY_FAIL" 'Run integration tests'
115+
print_status "$VERIFY_STATUS" 'Run integration tests'
116116

117117
if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
118-
print_status "$DANGER_FAIL" 'Run danger'
118+
print_status "$DANGER_STATUS" 'Run danger'
119119
fi
120120

121121
echo
@@ -151,6 +151,6 @@ fi
151151

152152
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
153153

154-
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
154+
if [ -n "$CS_STATUS$PMD_STATUS$CODENARC_STATUS$LICENSE_STATUS$POM_STATUS$BOOTLINT_STATUS$RFLINT_STATUS$JASMINE_STATUS$HTML_STATUS$ENFORCER_STATUS$TEST_STATUS$FINDBUGS_STATUS$VERIFY_STATUS$DANGER_STATUS" ]; then
155155
exit 1
156156
fi

0 commit comments

Comments
 (0)