diff options
| author | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2026-01-09 16:08:38 +0100 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2026-01-09 20:57:13 +0100 |
| commit | 4e173d0e97aa8684ad27d97888b71d80549c4bbb (patch) | |
| tree | b9526abc88ada38ccb62cc868365e272d52fef4e /.github | |
| parent | 160d786cb664bee46bdf48e7dfecba1a0197d89b (diff) | |
| download | Project-Tick-4e173d0e97aa8684ad27d97888b71d80549c4bbb.tar.gz Project-Tick-4e173d0e97aa8684ad27d97888b71d80549c4bbb.zip | |
Resolve merge conflicts in coverage data, instead of aborting.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/cmake.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/pigz.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 6301451b72..37bbfd0157 100644 --- 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 8fd27ed32e..3df8e51c2d 100644 --- 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 |