From 35cc63eed19520fdd8bca8558bb108c8ca22a998 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 12:50:19 +0100 Subject: [PATCH 01/11] add gh workflow for coverage --- .github/workflows/keyvi.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index db090dca6..435c71921 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -21,6 +21,9 @@ jobs: matrix: type: ['Release', 'Debug'] os: ['macos-latest', 'ubuntu-20.04'] + include: + - os: 'ubuntu-20.04' + type: 'Coverage' steps: - name: install Linux deps if: runner.os == 'Linux' @@ -75,7 +78,19 @@ jobs: id: unit_tests run: | build/unit_test_all - + + - name: Coverage + if: runner.type == 'Coverage' + run: | + python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage + coveralls -r . -b build/ -i keyvi \ + --gcov-options '\-lp' \ + -E '.*/keyvi/3rdparty/.*' \ + -e python \ + -E '.*/keyvi/tests/.*' \ + -E '.*/keyvi/bin/.*' \ + --dump keyvi.cov_report > /dev/null + - name: Stats from ccache id: ccache_stats run: | From 63b3c5af5af9375ff4601317fa913315f778af7a Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 14:16:29 +0100 Subject: [PATCH 02/11] use matrix.type --- .github/workflows/keyvi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index 435c71921..210b2f54d 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -80,7 +80,7 @@ jobs: build/unit_test_all - name: Coverage - if: runner.type == 'Coverage' + if: matrix.type == 'Coverage' run: | python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage coveralls -r . -b build/ -i keyvi \ From 560ce50842e2d6e86e2ff062dca96eaa042455c5 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 14:25:16 +0100 Subject: [PATCH 03/11] set path for coveralls --- .github/workflows/keyvi.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index 210b2f54d..ead899e39 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -82,7 +82,8 @@ jobs: - name: Coverage if: matrix.type == 'Coverage' run: | - python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage + python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage --user + export PATH="/home/runner/.local/bin:$PATH" coveralls -r . -b build/ -i keyvi \ --gcov-options '\-lp' \ -E '.*/keyvi/3rdparty/.*' \ From 448477106632e5fc294c162f9aecbbbaab60c70d Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 14:59:02 +0100 Subject: [PATCH 04/11] try to post result --- .github/workflows/keyvi.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index ead899e39..33bb6e5e8 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -81,6 +81,9 @@ jobs: - name: Coverage if: matrix.type == 'Coverage' + env: + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + COVERALLS_PARALLEL=true run: | python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage --user export PATH="/home/runner/.local/bin:$PATH" @@ -89,8 +92,7 @@ jobs: -E '.*/keyvi/3rdparty/.*' \ -e python \ -E '.*/keyvi/tests/.*' \ - -E '.*/keyvi/bin/.*' \ - --dump keyvi.cov_report > /dev/null + -E '.*/keyvi/bin/.*' - name: Stats from ccache id: ccache_stats From f0621739d1360471c932439d50a14d0ead5073c0 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 15:09:29 +0100 Subject: [PATCH 05/11] fix syntax --- .github/workflows/keyvi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index 33bb6e5e8..a0e7206e5 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -83,7 +83,7 @@ jobs: if: matrix.type == 'Coverage' env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_PARALLEL=true + COVERALLS_PARALLEL: true run: | python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage --user export PATH="/home/runner/.local/bin:$PATH" From 9a165630777b0c01b3c7964e03d527884dd76bc5 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 17:01:42 +0100 Subject: [PATCH 06/11] use lcov --- .github/workflows/keyvi.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index a0e7206e5..1b56bd52e 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -79,20 +79,18 @@ jobs: run: | build/unit_test_all - - name: Coverage + - name: lcov if: matrix.type == 'Coverage' - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_PARALLEL: true run: | - python -m pip install git+https://github.com/hendrikmuhs/cpp-coveralls.git@gcov-template-coverage --user - export PATH="/home/runner/.local/bin:$PATH" - coveralls -r . -b build/ -i keyvi \ - --gcov-options '\-lp' \ - -E '.*/keyvi/3rdparty/.*' \ - -e python \ - -E '.*/keyvi/tests/.*' \ - -E '.*/keyvi/bin/.*' + sudo apt-get install -y lcov + lcov -d build --capture --output-file coverage.info + + - name: Coveralls + uses: coverallsapp/github-action@master + if: matrix.type == 'Coverage' + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: coverage.info - name: Stats from ccache id: ccache_stats From d36b801dc564c3a2161f1b7397c67556b40ed89d Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 17:15:36 +0100 Subject: [PATCH 07/11] debug output --- .github/workflows/keyvi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index 1b56bd52e..246bbaa2e 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -83,6 +83,7 @@ jobs: if: matrix.type == 'Coverage' run: | sudo apt-get install -y lcov + ls build/CMakeFiles/unit_test_all.dir/keyvi/tests/keyvi/ lcov -d build --capture --output-file coverage.info - name: Coveralls From 46799aa8781c89711b0672a79b44e4c59f706ed4 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 17:30:23 +0100 Subject: [PATCH 08/11] debug --- .github/workflows/keyvi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index 246bbaa2e..ff9197355 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -70,7 +70,7 @@ jobs: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' cmakeBuildType: ${{matrix.type}} - cmakeAppendedArgs: '-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache' + cmakeAppendedArgs: '-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache' -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON buildWithCMake: true buildDirectory: '${{ github.workspace }}/build' From fc978d38bbedd95e554c41ce3bc99962f54fc470 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 17:33:17 +0100 Subject: [PATCH 09/11] fix string --- .github/workflows/keyvi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index ff9197355..c106006a2 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -70,7 +70,7 @@ jobs: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' cmakeBuildType: ${{matrix.type}} - cmakeAppendedArgs: '-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache' -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON + cmakeAppendedArgs: '-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON' buildWithCMake: true buildDirectory: '${{ github.workspace }}/build' From fd743c8ea21e8d6824487d29570b15112a6c6393 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 17:45:21 +0100 Subject: [PATCH 10/11] fix build type --- .github/workflows/keyvi.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index c106006a2..eec4530b3 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -69,8 +69,7 @@ jobs: with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - cmakeBuildType: ${{matrix.type}} - cmakeAppendedArgs: '-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON' + cmakeAppendedArgs: '-DCMAKE_BUILD_TYPE=${{ matrix.type }} -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON' buildWithCMake: true buildDirectory: '${{ github.workspace }}/build' From 4fe706fb3e98d4aa5fa8b697aa27e72e2112c6e5 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Sat, 5 Dec 2020 20:47:19 +0100 Subject: [PATCH 11/11] add a filter --- .github/workflows/keyvi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/keyvi.yml b/.github/workflows/keyvi.yml index eec4530b3..c8aacf604 100644 --- a/.github/workflows/keyvi.yml +++ b/.github/workflows/keyvi.yml @@ -83,7 +83,7 @@ jobs: run: | sudo apt-get install -y lcov ls build/CMakeFiles/unit_test_all.dir/keyvi/tests/keyvi/ - lcov -d build --capture --output-file coverage.info + lcov -d build --capture --include '*/keyvi/include/keyvi/*' --output-file coverage.info - name: Coveralls uses: coverallsapp/github-action@master