Merge pull request #4874 from blueyed/pypy3-azure

ci: azure: fix coverage reporting with PyPy (not used currently)
This commit is contained in:
Daniel Hahler 2019-03-04 17:58:28 +01:00 committed by GitHub
commit ddb16a1ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 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'
@ -112,8 +116,9 @@ jobs:
condition: succeededOrFailed() condition: succeededOrFailed()
- script: call scripts\upload-coverage.bat - script: call scripts\upload-coverage.bat
displayName: 'Upload coverage' displayName: 'Report and 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%
) )