ci: Azure: fix coverage generation with PyPy

While this is not used currently, it is still good for having it covered
(it failed when running coverage with all jobs unconditionally).
This commit is contained in:
Daniel Hahler 2019-03-02 00:50:31 +01:00
parent 54c70bc02c
commit fa94e3c1b2
2 changed files with 10 additions and 5 deletions

View File

@ -37,6 +37,10 @@ jobs:
python.version: 'pypy' python.version: 'pypy'
tox.env: 'pypy' tox.env: 'pypy'
python.exe: 'pypy' python.exe: 'pypy'
pypy3:
python.version: 'pypy3'
tox.env: 'pypy3'
python.exe: 'pypy3'
py34: py34:
python.version: '3.4' python.version: '3.4'
tox.env: 'py34' tox.env: 'py34'
@ -115,5 +119,6 @@ jobs:
displayName: 'Upload coverage' displayName: 'Upload coverage'
condition: eq(variables['PYTEST_COVERAGE'], '1') condition: eq(variables['PYTEST_COVERAGE'], '1')
env: env:
PYTHON: $(python.exe)
CODECOV_TOKEN: $(CODECOV_TOKEN) CODECOV_TOKEN: $(CODECOV_TOKEN)
PYTEST_CODECOV_NAME: $(tox.env) PYTEST_CODECOV_NAME: $(tox.env)

View File

@ -6,11 +6,11 @@ if "%PYTEST_COVERAGE%" == "1" (
) else ( ) else (
echo CODECOV_TOKEN NOT defined echo CODECOV_TOKEN NOT defined
) )
python -m pip install codecov %PYTHON% -m pip install codecov
coverage combine %PYTHON% -m coverage combine
coverage xml %PYTHON% -m coverage xml
coverage report -m %PYTHON% -m coverage report -m
scripts\retry codecov --required -X gcov pycov search -f coverage.xml --name %PYTEST_CODECOV_NAME% scripts\retry %PYTHON% -m codecov --required -X gcov pycov search -f coverage.xml --name %PYTEST_CODECOV_NAME%
) else ( ) else (
echo Skipping coverage upload, PYTEST_COVERAGE=%PYTEST_COVERAGE% echo Skipping coverage upload, PYTEST_COVERAGE=%PYTEST_COVERAGE%
) )