From ca528fba52a2ba187cf06ee4c8f6df2693b402e0 Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Tue, 21 Nov 2023 09:22:23 -0600 Subject: [PATCH 1/3] Rearrange lcov file handling --- .github/workflows/build.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bc94242b8..d5cfc75a16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,16 +18,6 @@ jobs: runs-on: windows-latest steps: - - name: Stub Node dependencies - shell: bash - run: touch package-lock.json - - name: Install Node for coverage reporting - uses: actions/setup-node@v4.0.0 - with: - node-version: '16.x' - cache: 'npm' - - name: LCov merger tool - run: npm install -g lcov-result-merger - name: Checkout code uses: actions/checkout@v4 - name: Determine RDMP build version @@ -105,13 +95,11 @@ jobs: mv `find coverage -type f` fs-ui.lcov dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov mv `find coverage -type f` fs-core.lcov - - name: Merge LCovs - run: lcov-result-merger "{db,fs}-{ui,core}.lcov" all.lcov - name: Coveralls uses: coverallsapp/github-action@master with: github-token: ${{ secrets.github_token }} - path-to-lcov: all.lcov + files: db-ui.lcov db-core.lcov fs-ui.lcov fs-core.lcov flag-name: unit tests - name: Package From 5b92bb1367ee2e97122531b28525d903c68f12d2 Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Tue, 21 Nov 2023 10:04:31 -0600 Subject: [PATCH 2/3] Change lcov paths --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d5cfc75a16..e66a189a34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,7 +99,7 @@ jobs: uses: coverallsapp/github-action@master with: github-token: ${{ secrets.github_token }} - files: db-ui.lcov db-core.lcov fs-ui.lcov fs-core.lcov + files: ./db-ui.lcov ./db-core.lcov ./fs-ui.lcov ./fs-core.lcov flag-name: unit tests - name: Package From 648744869b61d8c35743d99cf63f8b82d28b8e66 Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Tue, 21 Nov 2023 11:25:56 -0600 Subject: [PATCH 3/3] Update coveralls action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e66a189a34..850234e007 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov mv `find coverage -type f` fs-core.lcov - name: Coveralls - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.github_token }} files: ./db-ui.lcov ./db-core.lcov ./fs-ui.lcov ./fs-core.lcov