Resolve merge conflicts in coverage data, instead of aborting.

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 6301451b722192603f3d2161d246e9045d732e8b..37bbfd015787a791e4a5fb067f623a3090dd6e57 100644 (file)
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -62,7 +62,7 @@ jobs:
             codecov: ubuntu_gcc_osb
             cflags: -O3
 
-          - name: Ubuntu GCC -O3 OSB add_subdirectory
+          - name: Ubuntu GCC OSB add_subdirectory
             os: ubuntu-latest
             compiler: gcc
             cxx-compiler: g++
@@ -847,6 +847,8 @@ jobs:
         python3 -u -m pip install gcovr
         python3 -m gcovr ${{ matrix.build-dir || '' }} -j 3 --gcov-ignore-parse-errors --verbose \
           --exclude-unreachable-branches \
+          --merge-mode-functions separate \
+          --merge-lines \
           --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" \
           --root ${{ matrix.build-src-dir || '.' }} \
           --xml --output ${{ matrix.codecov }}.xml

diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml
index 8fd27ed32ed56e0531b466164966e1fcaf77d715..3df8e51c2d163386289b44ce67a4f107653a740d 100644 (file)
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -108,6 +108,8 @@ jobs:
         python3 -u -m pip install gcovr
         python3 -m gcovr -j 3 --gcov-ignore-parse-errors --verbose \
           --exclude-unreachable-branches \
+          --merge-mode-functions separate \
+          --merge-lines \
           --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" \
           --root . \
           --xml --output ${{ matrix.codecov }}.xml