@@ -58,7 +58,6 @@ if [ "${1:-}" = '--only-integration-tests' ]; then
58
58
RUN_ONLY_INTEGRATION_TESTS=yes
59
59
fi
60
60
61
- CS_STATUS=
62
61
PMD_STATUS=
63
62
LICENSE_STATUS=
64
63
POM_STATUS=
@@ -79,7 +78,6 @@ if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' ] && [ "${TRAVIS_PULL_REQUEST:-fal
79
78
DANGER_STATUS=
80
79
fi
81
80
82
- CS_TIME=0
83
81
PMD_TIME=0
84
82
LICENSE_TIME=0
85
83
POM_TIME=0
@@ -116,7 +114,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
116
114
if [ -n " $MODIFIED_FILES " ]; then
117
115
AFFECTS_POM_XML=" $( echo " $MODIFIED_FILES " | grep -Fxq ' pom.xml' || echo ' no' ) "
118
116
AFFECTS_TRAVIS_CFG=" $( echo " $MODIFIED_FILES " | grep -Fxq ' .travis.yml' || echo ' no' ) "
119
- AFFECTS_CS_CFG=" $( echo " $MODIFIED_FILES " | grep -Eq ' (checkstyle\.xml|checkstyle-suppressions\.xml)$' || echo ' no' ) "
120
117
AFFECTS_SPOTBUGS_CFG=" $( echo " $MODIFIED_FILES " | grep -q ' spotbugs-filter\.xml$' || echo ' no' ) "
121
118
AFFECTS_PMD_XML=" $( echo " $MODIFIED_FILES " | grep -q ' pmd\.xml$' || echo ' no' ) "
122
119
AFFECTS_JS_FILES=" $( echo " $MODIFIED_FILES " | grep -q ' \.js$' || echo ' no' ) "
@@ -125,7 +122,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
125
122
AFFECTS_ROBOT_FILES=" $( echo " $MODIFIED_FILES " | grep -q ' \.robot$' || echo ' no' ) "
126
123
AFFECTS_SHELL_FILES=" $( echo " $MODIFIED_FILES " | grep -q ' \.sh$' || echo ' no' ) "
127
124
AFFECTS_GROOVY_FILES=" $( echo " $MODIFIED_FILES " | grep -q ' \.groovy$' || echo ' no' ) "
128
- AFFECTS_PROPERTIES=" $( echo " $MODIFIED_FILES " | grep -q ' \.properties$' || echo ' no' ) "
129
125
AFFECTS_LICENSE_HEADER=" $( echo " $MODIFIED_FILES " | grep -q ' license_header\.txt$' || echo ' no' ) "
130
126
AFFECTS_PLAYBOOKS=" $( echo " $MODIFIED_FILES " | grep -Eq ' (vagrant|prod|deploy|bootstrap|/roles/.+)\.yml$' || echo ' no' ) "
131
127
@@ -137,10 +133,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
137
133
[ " $AFFECTS_SPOTBUGS_CFG " != ' no' ] || SPOTBUGS_STATUS=skip
138
134
[ " $AFFECTS_PMD_XML " != ' no' ] || PMD_STATUS=skip
139
135
140
- if [ " $AFFECTS_CS_CFG " = ' no' ] && [ " $AFFECTS_PROPERTIES " = ' no' ]; then
141
- CS_STATUS=skip
142
- fi
143
-
144
136
if [ " $AFFECTS_GROOVY_FILES " = ' no' ]; then
145
137
TEST_STATUS=skip
146
138
@@ -177,13 +169,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
177
169
178
170
echo
179
171
180
- if [ " $CS_STATUS " != ' skip' ]; then
181
- START_TIME=$SECONDS
182
- " $EXEC_CMD " checkstyle > cs.log 2>&1 || CS_STATUS=fail
183
- CS_TIME=$(( SECONDS - START_TIME))
184
- fi
185
- print_status " $CS_STATUS " " $CS_TIME " ' Run CheckStyle'
186
-
187
172
if [ " $PMD_STATUS " != ' skip' ]; then
188
173
START_TIME=$SECONDS
189
174
" $EXEC_CMD " pmd > pmd.log 2>&1 || PMD_STATUS=fail
292
277
print_status " $DANGER_STATUS " " $DANGER_TIME " ' Run danger'
293
278
294
279
if [ " $RUN_ONLY_INTEGRATION_TESTS " = ' no' ]; then
295
- [ " $CS_STATUS " = ' skip' ] || print_log cs.log ' Run CheckStyle'
296
280
[ " $PMD_STATUS " = ' skip' ] || print_log pmd.log ' Run PMD'
297
281
[ " $LICENSE_STATUS " = ' skip' ] || print_log license.log ' Check license headers'
298
282
[ " $POM_STATUS " = ' skip' ] || print_log pom.log ' Check sorting of pom.xml'
@@ -314,8 +298,8 @@ if [ "$DANGER_STATUS" != 'skip' ]; then
314
298
print_log danger.log ' Run danger'
315
299
fi
316
300
317
- rm -f cs.log pmd.log license.log pom.log bootlint.log rflint.log shellcheck.log jest.log validator.log enforcer.log test.log codenarc.log spotbugs.log verify.log danger.log ansible_lint.log
301
+ rm -f pmd.log license.log pom.log bootlint.log rflint.log shellcheck.log jest.log validator.log enforcer.log test.log codenarc.log spotbugs.log verify.log danger.log ansible_lint.log
318
302
319
- if echo " $CS_STATUS$ PMD_STATUS$LICENSE_STATUS$POM_STATUS$BOOTLINT_STATUS$RFLINT_STATUS$SHELLCHECK_STATUS$JEST_STATUS$HTML_STATUS$ENFORCER_STATUS$TEST_STATUS$CODENARC_STATUS$SPOTBUGS_STATUS$VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS " | grep -Fqs ' fail' ; then
303
+ if echo " $PMD_STATUS$LICENSE_STATUS$POM_STATUS$BOOTLINT_STATUS$RFLINT_STATUS$SHELLCHECK_STATUS$JEST_STATUS$HTML_STATUS$ENFORCER_STATUS$TEST_STATUS$CODENARC_STATUS$SPOTBUGS_STATUS$VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS " | grep -Fqs ' fail' ; then
320
304
exit 1
321
305
fi
0 commit comments