Skip to content

Commit a37cf37

Browse files
AlexSkrypnykAlexSkrypnyk
committed
Fixed coverage threshold check not storing results on low values in CI.
1 parent bfd9a5b commit a37cf37

26 files changed

Lines changed: 266 additions & 123 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -397,16 +397,13 @@ jobs:
397397
fi
398398
399399
- run:
400-
name: Check code coverage threshold
400+
name: Extract code coverage
401401
command: |
402402
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
403403
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
404404
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
405405
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
406-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
407-
echo "FAIL: coverage too low"
408-
exit 1
409-
fi
406+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
410407
411408
- run:
412409
name: Post coverage summary as PR comment
@@ -433,6 +430,15 @@ jobs:
433430
if [ -n "${CODECOV_TOKEN}" ] && [ -d /tmp/artifacts/coverage ] && ! echo "${CIRCLE_BRANCH}" | grep -q '^deps/'; then
434431
codecov -Z -s /tmp/artifacts/coverage;
435432
fi
433+
434+
- run:
435+
name: Check code coverage threshold
436+
command: |
437+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
438+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
439+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
440+
exit 1
441+
fi
436442
#;> TOOL_PHPUNIT
437443

438444
#;< TOOL_BEHAT

‎.github/workflows/build-test-deploy.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,16 +421,13 @@ jobs:
421421
docker compose cp cli:/app/.logs/. ".logs/"
422422
fi
423423
424-
- name: Check code coverage threshold
424+
- name: Extract code coverage
425425
if: ${{ matrix.instance == 0 || strategy.job-total == 1 }}
426426
run: |
427427
RATE=$(grep -om1 'line-rate="[0-9.]*"' .logs/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
428428
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
429429
echo "Coverage: $PERCENT% (threshold: $VORTEX_CI_CODE_COVERAGE_THRESHOLD%)" | tee -a "$GITHUB_STEP_SUMMARY"
430-
if [ "${PERCENT//./}" -lt "$((VORTEX_CI_CODE_COVERAGE_THRESHOLD*100))" ]; then
431-
echo "FAIL: coverage too low"
432-
exit 1
433-
fi
430+
echo "COVERAGE_PERCENT=${PERCENT}" >> "$GITHUB_ENV"
434431
{ echo "COVERAGE_CONTENT<<EOF"; sed '/./,$!d' .logs/coverage/phpunit/coverage.txt; echo "EOF"; } >> "$GITHUB_ENV"
435432
env:
436433
VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}
@@ -454,6 +451,16 @@ jobs:
454451
token: ${{ secrets.CODECOV_TOKEN }}
455452
env:
456453
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
454+
455+
- name: Check code coverage threshold
456+
if: ${{ matrix.instance == 0 || strategy.job-total == 1 }}
457+
run: |
458+
if [ "${COVERAGE_PERCENT//.}" -lt "$((VORTEX_CI_CODE_COVERAGE_THRESHOLD*100))" ]; then
459+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD}%"
460+
exit 1
461+
fi
462+
env:
463+
VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}
457464
#;> TOOL_PHPUNIT
458465

459466
#;< TOOL_BEHAT

‎.vortex/installer/tests/Fixtures/handler_process/_baseline/.github/workflows/build-test-deploy.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,16 +373,13 @@ jobs:
373373
docker compose cp cli:/app/.logs/. ".logs/"
374374
fi
375375
376-
- name: Check code coverage threshold
376+
- name: Extract code coverage
377377
if: ${{ matrix.instance == 0 || strategy.job-total == 1 }}
378378
run: |
379379
RATE=$(grep -om1 'line-rate="[0-9.]*"' .logs/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
380380
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
381381
echo "Coverage: $PERCENT% (threshold: $VORTEX_CI_CODE_COVERAGE_THRESHOLD%)" | tee -a "$GITHUB_STEP_SUMMARY"
382-
if [ "${PERCENT//./}" -lt "$((VORTEX_CI_CODE_COVERAGE_THRESHOLD*100))" ]; then
383-
echo "FAIL: coverage too low"
384-
exit 1
385-
fi
382+
echo "COVERAGE_PERCENT=${PERCENT}" >> "$GITHUB_ENV"
386383
{ echo "COVERAGE_CONTENT<<EOF"; sed '/./,$!d' .logs/coverage/phpunit/coverage.txt; echo "EOF"; } >> "$GITHUB_ENV"
387384
env:
388385
VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}
@@ -407,6 +404,16 @@ jobs:
407404
env:
408405
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
409406

407+
- name: Check code coverage threshold
408+
if: ${{ matrix.instance == 0 || strategy.job-total == 1 }}
409+
run: |
410+
if [ "${COVERAGE_PERCENT//.}" -lt "$((VORTEX_CI_CODE_COVERAGE_THRESHOLD*100))" ]; then
411+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD}%"
412+
exit 1
413+
fi
414+
env:
415+
VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}
416+
410417
- name: Test with Behat
411418
run: |
412419
# shellcheck disable=SC2170

‎.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,13 @@ jobs:
352352
fi
353353
354354
- run:
355-
name: Check code coverage threshold
355+
name: Extract code coverage
356356
command: |
357357
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
358358
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
359359
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
360360
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
361-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
362-
echo "FAIL: coverage too low"
363-
exit 1
364-
fi
361+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
365362
366363
- run:
367364
name: Post coverage summary as PR comment
@@ -389,6 +386,15 @@ jobs:
389386
codecov -Z -s /tmp/artifacts/coverage;
390387
fi
391388
389+
- run:
390+
name: Check code coverage threshold
391+
command: |
392+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
393+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
394+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
395+
exit 1
396+
fi
397+
392398
- run:
393399
name: Test with Behat
394400
command: |

‎.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,13 @@ jobs:
352352
fi
353353
354354
- run:
355-
name: Check code coverage threshold
355+
name: Extract code coverage
356356
command: |
357357
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
358358
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
359359
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
360360
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
361-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
362-
echo "FAIL: coverage too low"
363-
exit 1
364-
fi
361+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
365362
366363
- run:
367364
name: Post coverage summary as PR comment
@@ -389,6 +386,15 @@ jobs:
389386
codecov -Z -s /tmp/artifacts/coverage;
390387
fi
391388
389+
- run:
390+
name: Check code coverage threshold
391+
command: |
392+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
393+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
394+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
395+
exit 1
396+
fi
397+
392398
- run:
393399
name: Test with Behat
394400
command: |

‎.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,13 @@ jobs:
352352
fi
353353
354354
- run:
355-
name: Check code coverage threshold
355+
name: Extract code coverage
356356
command: |
357357
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
358358
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
359359
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
360360
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
361-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
362-
echo "FAIL: coverage too low"
363-
exit 1
364-
fi
361+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
365362
366363
- run:
367364
name: Post coverage summary as PR comment
@@ -389,6 +386,15 @@ jobs:
389386
codecov -Z -s /tmp/artifacts/coverage;
390387
fi
391388
389+
- run:
390+
name: Check code coverage threshold
391+
command: |
392+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
393+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
394+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
395+
exit 1
396+
fi
397+
392398
- run:
393399
name: Test with Behat
394400
command: |

‎.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_gha/.github/workflows/build-test-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@@ -452,79 +452,3 @@
1+
@@ -459,79 +459,3 @@
22
timeout-minutes: 120 # Cancel the action after 15 minutes, regardless of whether a connection has been established.
33
with:
44
detached: true

‎.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,13 @@ jobs:
352352
fi
353353
354354
- run:
355-
name: Check code coverage threshold
355+
name: Extract code coverage
356356
command: |
357357
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
358358
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
359359
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
360360
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
361-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
362-
echo "FAIL: coverage too low"
363-
exit 1
364-
fi
361+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
365362
366363
- run:
367364
name: Post coverage summary as PR comment
@@ -389,6 +386,15 @@ jobs:
389386
codecov -Z -s /tmp/artifacts/coverage;
390387
fi
391388
389+
- run:
390+
name: Check code coverage threshold
391+
command: |
392+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
393+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
394+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
395+
exit 1
396+
fi
397+
392398
- run:
393399
name: Test with Behat
394400
command: |

‎.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,13 @@ jobs:
352352
fi
353353
354354
- run:
355-
name: Check code coverage threshold
355+
name: Extract code coverage
356356
command: |
357357
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
358358
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
359359
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
360360
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
361-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
362-
echo "FAIL: coverage too low"
363-
exit 1
364-
fi
361+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
365362
366363
- run:
367364
name: Post coverage summary as PR comment
@@ -389,6 +386,15 @@ jobs:
389386
codecov -Z -s /tmp/artifacts/coverage;
390387
fi
391388
389+
- run:
390+
name: Check code coverage threshold
391+
command: |
392+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
393+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
394+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
395+
exit 1
396+
fi
397+
392398
- run:
393399
name: Test with Behat
394400
command: |

‎.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,16 +361,13 @@ jobs:
361361
fi
362362
363363
- run:
364-
name: Check code coverage threshold
364+
name: Extract code coverage
365365
command: |
366366
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
367367
RATE=$(grep -om1 'line-rate="[0-9.]*"' /tmp/artifacts/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
368368
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
369369
echo "Coverage: $PERCENT% (threshold: ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%)"
370-
if [ "${PERCENT//./}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
371-
echo "FAIL: coverage too low"
372-
exit 1
373-
fi
370+
echo "export COVERAGE_PERCENT=${PERCENT}" >> "${BASH_ENV}"
374371
375372
- run:
376373
name: Post coverage summary as PR comment
@@ -398,6 +395,15 @@ jobs:
398395
codecov -Z -s /tmp/artifacts/coverage;
399396
fi
400397
398+
- run:
399+
name: Check code coverage threshold
400+
command: |
401+
[ "${CIRCLE_NODE_TOTAL:-1}" -gt 1 ] && [ "${CIRCLE_NODE_INDEX:-0}" -ne 0 ] && exit 0
402+
if [ "${COVERAGE_PERCENT//.}" -lt "$((${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}*100))" ]; then
403+
echo "FAIL: coverage ${COVERAGE_PERCENT}% is below threshold ${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}%"
404+
exit 1
405+
fi
406+
401407
- run:
402408
name: Test with Behat
403409
command: |

0 commit comments

Comments
 (0)