diff --git a/.azure-devops/merge.yml b/.azure-devops/merge.yml index 762950505..6a620155e 100644 --- a/.azure-devops/merge.yml +++ b/.azure-devops/merge.yml @@ -1,10 +1,14 @@ trigger: -- dev -- master + branches: + include: + - dev + - master pr: -- dev -- master + branches: + include: + - dev + - master variables: iot_ext_package: azure-iot diff --git a/.azure-devops/templates/calculate-code-coverage.yml b/.azure-devops/templates/calculate-code-coverage.yml index eb14c272a..76000c8fe 100644 --- a/.azure-devops/templates/calculate-code-coverage.yml +++ b/.azure-devops/templates/calculate-code-coverage.yml @@ -24,7 +24,7 @@ steps: for i in ./coverage/.coverage.*; do coverage combine -a $i done - coverage xml --rcfile="$(System.DefaultWorkingDirectory)/.coveragerc" + coverage xml -i --rcfile="$(System.DefaultWorkingDirectory)/.coveragerc" workingDirectory: '$(System.ArtifactsDirectory)/aziotext_kpi/' displayName: 'Merging code coverage data'