Explicit branch includes. (#338)

Azure · Apr 30, 2021 · e57707f · e57707f
1 parent b052e4c
commit e57707f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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'