Skip to content

Commit 9ec66bf

Browse files
committed
Make GitHub Actions only verify coverage of all jobs combined
1 parent 13ec621 commit 9ec66bf

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

.github/workflows/test.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,36 @@ jobs:
3232
run: python -m pip install tox tox-gh-actions
3333
- name: Test with tox
3434
run: python -m tox
35-
- name: Collect coverage results
36-
uses: AndreMiras/coveralls-python-action@develop
35+
- name: Store partial coverage reports
36+
uses: actions/upload-artifact@v2
3737
with:
38-
parallel: true
39-
flag-name: test (${{ matrix.python-version}})
38+
name: coverage
39+
path: .coverage.*
4040

4141
coveralls:
4242
needs: test
4343
runs-on: ubuntu-latest
4444
steps:
45+
- name: Checkout code
46+
uses: actions/checkout@v1
47+
- name: Setup Python 3.9
48+
uses: actions/setup-python@v2
49+
with:
50+
python-version: 3.9
51+
- name: Install coverage package
52+
run: python -m pip install -U coverage
53+
- name: Download partial coverage reports
54+
uses: actions/download-artifact@v2
55+
with:
56+
name: coverage
57+
- name: Combine coverage
58+
run: python -m coverage combine
59+
- name: Report coverage
60+
run: python -m coverage report
61+
- name: Export coverage to XML
62+
run: python -m coverage xml
4563
- name: Upload coverage statistics to Coveralls
4664
uses: AndreMiras/coveralls-python-action@develop
47-
with:
48-
parallel-finished: true
4965

5066
lint:
5167
runs-on: ubuntu-latest

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ branch = true
111111
omit = fs/test.py
112112
source = fs
113113
relative_files = true
114+
parallel = true
114115
115116
[coverage:report]
116117
show_missing = true
@@ -135,10 +136,9 @@ requires =
135136
setuptools >=38.3.0
136137
137138
[testenv]
138-
commands = pytest --cov={toxinidir}/fs {posargs} {toxinidir}/tests
139+
commands = python -m coverage run --rcfile {toxinidir}/setup.cfg -m pytest {posargs} {toxinidir}/tests
139140
deps =
140141
-rtests/requirements.txt
141-
pytest-cov~=2.11
142142
coverage~=5.0
143143
py{36,37,38,39}: pytest~=6.2
144144
py{27,34}: pytest~=4.6

0 commit comments

Comments
 (0)