From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Tue, 6 Jul 2021 20:37:23 +0000 (-0600)
Subject: github: Fix merge collision in v1/v2 code coverage
X-Git-Tag: v3.0~265^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73db2d0c6f4f97cd0744cc8f35015665a2182840;p=thirdparty%2Flibcgroup.git

github: Fix merge collision in v1/v2 code coverage

Fix merge collision in the gathering of the v1/v2
code coverage metrics.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 06722b46..b4769b7d 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -144,19 +144,21 @@ jobs:
         name: Cgroup v1v2 test logs
         path: tests/ftests/*.log
     - name: Collate code coverage results
-      run: lcov -d . -c > lcov.info
+      run: |
+        lcov -d . -c -o lcov.tests
+        lcov -a lcov.base -a lcov.tests -o lcov.total
     - name: Upload code coverage results
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: ./lcov.info
+        path-to-lcov: ./lcov.total
         flag-name: "Cgroup v1/v2 Functional Tests"
         parallel: True
     - name: Archive code coverage results
       if: ${{ always() }}
       uses: actions/upload-artifact@v2
       with:
-        name: Cgroup v1 Code Coverage
+        name: Cgroup v1v2 Code Coverage
         path: lcov.*
 
   functionaltestsv2: