summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernat Gabor <gaborjbernat@gmail.com>2018-10-30 07:39:43 +0000
committerBernát Gábor <gaborjbernat@gmail.com>2018-10-30 07:51:42 +0000
commit46dc42b6ca99062fecc1c9babd61c4196cc7331a (patch)
treec4578f91cd7d66fc65af26e22c92094ba0d1b86d
parent7f2a68f88a07a6a30cabd5c8a23d9f108e897f7c (diff)
downloadvirtualenv-46dc42b6ca99062fecc1c9babd61c4196cc7331a.tar.gz
cross python and coverage from jython
-rw-r--r--azure-pipelines.yml6
-rw-r--r--azure-run-tox-env.yml8
2 files changed, 10 insertions, 4 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e52b060..b3aa669 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -24,6 +24,12 @@ jobs:
parameters: {tox: jython, python: 3.7, os: linux}
- template: azure-run-tox-env.yml
+ parameters: {tox: cross_python2, python: 3.7, os: linux}
+
+- template: azure-run-tox-env.yml
+ parameters: {tox: cross_python3, python: 3.7, os: linux}
+
+- template: azure-run-tox-env.yml
parameters: {tox: fix_lint, python: 3.7}
- template: azure-run-tox-env.yml
parameters: {tox: embed, python: 3.7}
diff --git a/azure-run-tox-env.yml b/azure-run-tox-env.yml
index 6dd6e56..6e144f1 100644
--- a/azure-run-tox-env.yml
+++ b/azure-run-tox-env.yml
@@ -56,14 +56,14 @@ jobs:
- script: ${{ format('python -m tox -e {0} --notest --skip-missing-interpreters=false', parameters.tox) }}
displayName: install test dependencies
- - ${{ if startsWith(parameters.tox, 'py') }}:
+ - ${{ if or( startsWith(parameters.tox, 'py'), eq(parameters.tox, 'jython') ) }}:
- script: python -m tox -e coverage --notest --skip-missing-interpreters=false
displayName: install coverage dependencies
- script: ${{ format('python -m tox --skip-missing-interpreters=false -e {0}', parameters.tox) }}
displayName: run tests
- - ${{ if and( startsWith(parameters.tox, 'py'), eq(variables['system.pullrequest.isfork'], false) ) }}:
+ - ${{ if and( or( startsWith(parameters.tox, 'py'), eq(parameters.tox, 'jython') ), eq(variables['system.pullrequest.isfork'], false) ) }}:
- task: PublishTestResults@2
displayName: publish test results via junit
condition: succeededOrFailed()
@@ -72,12 +72,12 @@ jobs:
testResultsFiles: ${{ format('$(System.DefaultWorkingDirectory)/.tox/.test.{0}.xml', parameters.tox) }}
testRunTitle: ${{ format('{0}_{1}', parameters.os, parameters.tox) }}
- - ${{ if startsWith(parameters.tox, 'py') }}:
+ - ${{ if or( startsWith(parameters.tox, 'py'), eq(parameters.tox, 'jython') ) }}:
- script: "python -m tox --skip-missing-interpreters=false -e coverage"
displayName: create coverag report
condition: succeededOrFailed()
- - ${{ if and( startsWith(parameters.tox, 'py'), eq(variables['system.pullrequest.isfork'], false) ) }}:
+ - ${{ if and( or( startsWith(parameters.tox, 'py'), eq(parameters.tox, 'jython') ), eq(variables['system.pullrequest.isfork'], false) ) }}:
- task: CopyFiles@2
displayName: move coverage files into staging area
condition: succeededOrFailed()