ci: refine coverage codecov reports (#75)

serious-scaffold · Mar 15, 2024 · 315134d · 315134d
1 parent 412d342
commit 315134d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -168,9 +168,10 @@ jobs:
         uses: codecov/codecov-action@v4.1.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}/code_coverage/coverage.xml
-          flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }}
-          name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }}-coverage
+          directory: out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}/code_coverage
+          files: ./coverage.xml, ./coverage.info, ./coverage.json
+          flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}
+          name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}-coverage
 
   pass:
     if: always()

diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml
@@ -168,9 +168,10 @@ jobs:
         uses: codecov/codecov-action@v4.1.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}/code_coverage/coverage.xml
-          flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }}
-          name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }}-coverage
+          directory: out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}/code_coverage
+          files: ./coverage.xml, ./coverage.info, ./coverage.json
+          flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}
+          name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}-coverage
 
   pass:
     if: always()

diff --git a/template/vcpkg.json.jinja b/template/vcpkg.json.jinja
@@ -37,7 +37,7 @@
 [%- endif %]
     {
       "name": "cmake-modules",
-      "version": "1.3.15"
+      "version": "1.3.17"
     },
     {
       "name": "robotology-cmake-ycm",
@@ -48,7 +48,7 @@
     "registries": [
       {
         "kind": "git",
-        "baseline": "7bb7d6b2b5d4ca7d532596d98fd5ff73d6bd4ae0",
+        "baseline": "c4c46309422d8602c712a2d7c3e1987c0e6aeab3",
         "repository": "https://github.com/msclock/cmake-registry",
         "packages": [
 [%- if use_conan == true %]

diff --git a/vcpkg.json b/vcpkg.json
@@ -15,7 +15,7 @@
     },
     {
       "name": "cmake-modules",
-      "version": "1.3.15"
+      "version": "1.3.17"
     },
     {
       "name": "robotology-cmake-ycm",
@@ -26,7 +26,7 @@
     "registries": [
       {
         "kind": "git",
-        "baseline": "7bb7d6b2b5d4ca7d532596d98fd5ff73d6bd4ae0",
+        "baseline": "c4c46309422d8602c712a2d7c3e1987c0e6aeab3",
         "repository": "https://github.com/msclock/cmake-registry",
         "packages": [
           "cmake-modules",