File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -8,11 +8,11 @@ matrix:
88 include :
99 # Build with latest ruby
1010 - rvm : 2.5
11- env : RUBOCOP_TEST="true " RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
11+ env : RUBOCOP_TEST="false " RSPEC_TEST="true" ENFORCE_COVERAGE ="true" PUPPET_VERSIONS="3.8.7"
1212 - rvm : 2.5
13- env : RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="4.10.8"
13+ env : RUBOCOP_TEST="false" RSPEC_TEST="true" ENFORCE_COVERAGE="true" PUPPET_VERSIONS="4.10.8"
1414 - rvm : 2.5
15- env : RUBOCOP_TEST="false " RSPEC_TEST="true" PUPPET_VERSIONS="5.0.0"
15+ env : RUBOCOP_TEST="true " RSPEC_TEST="true" ENFORCE_COVERAGE ="true" PUPPET_VERSIONS="5.0.0"
1616 # Build with older ruby versions
1717 - rvm : 2.4
1818 env : RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
Original file line number Diff line number Diff line change @@ -151,7 +151,10 @@ echo "Finished script/cibuild:"
151151[ " $RUBOCOP_EXITCODE " -ge 0 ] && echo " - rubocop: exit ${RUBOCOP_EXITCODE} "
152152[ " $RSPEC_EXITCODE " -ge 0 ] && echo " - rspec: exit ${RSPEC_EXITCODE} "
153153[ " $COVERAGE_EXITCODE " -ge 0 ] && echo " - coverage: exit ${COVERAGE_EXITCODE} "
154- if [ " $RUBOCOP_EXITCODE " -gt 0 ] || [ " $RSPEC_EXITCODE " -gt 0 ] || [ " $COVERAGE_EXITCODE " -gt 0 ]; then
154+ if [ " $RUBOCOP_EXITCODE " -gt 0 ] || [ " $RSPEC_EXITCODE " -gt 0 ]; then
155+ exit 1
156+ fi
157+ if [ " $COVERAGE_EXITCODE " -gt 0 ] && [ " $ENFORCE_COVERAGE " == " true" ]; then
155158 exit 1
156159fi
157160exit 0
You can’t perform that action at this time.
0 commit comments