Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete notify and spinner JS code #1892

Merged
merged 15 commits into from
Oct 8, 2022
Merged
Prev Previous commit
Next Next commit
upgrade codecov-action@v3
mvorisek committed Oct 7, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 7fe83644488a8767cc60fd71d6322c1d52fa252c
25 changes: 8 additions & 17 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
@@ -224,10 +224,11 @@ jobs:

- name: Upload coverage logs 2/2 (only for latest Phpunit)
if: env.LOG_COVERAGE
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/merged.xml
fail_ci_if_error: true
files: coverage/merged.xml

behat-test:
name: Behat
@@ -431,31 +432,21 @@ jobs:
php demos/_demo-data/create-db.php
vendor/bin/behat -vv --config behat.yml.dist

- name: Upload PHP coverage logs 1/2 (only for coverage)
- name: Upload coverage logs 1/2 (only for coverage)
if: env.LOG_COVERAGE
run: |
ls -l coverage | wc -l
php -d memory_limit=2G vendor/bin/phpcov merge coverage/ --clover coverage/merged.xml

- name: Upload PHP coverage logs 2/2 (only for coverage)
if: env.LOG_COVERAGE
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/merged.xml

- name: Upload JS coverage logs 1/2 (only for coverage)
if: env.LOG_COVERAGE
run: |
ls -l coverage/js | wc -l
(cd js && npx nyc report --temp-dir ../coverage/js --report-dir ../coverage/js --reporter=clover)
# fix never reached condition is rendered to clover with falsecount = 2 (or even higher if condition has multiple statements)
# https://github.com/istanbuljs/istanbuljs/issues/695
sed -i -E 's~count="0" type="cond" truecount="0" falsecount="[1-9]+"~count="0" type="cond" truecount="0" falsecount="0"~' coverage/js/clover.xml

- name: Upload JS coverage logs 2/2 (only for coverage)
- name: Upload coverage logs 2/2 (only for coverage)
if: env.LOG_COVERAGE
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/js/clover.xml
fail_ci_if_error: true
files: coverage/merged.xml,coverage/js/clover.xml