From 8c90a3368c925c67cef3393e42b832c3437f978c Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:14:56 +0100 Subject: [PATCH 01/22] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee31065ab2..212c455961 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov - name: Coveralls if: matrix.os == 'ubuntu-latest' - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@release/v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./coverage/lcov.net7.0.info From e38d1b5a3fa259453a0ad3c07e848023444c508d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Naz=C3=A1rio=20Coelho?= Date: Thu, 22 Feb 2024 20:19:38 -0300 Subject: [PATCH 02/22] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 212c455961..e7abd176de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: uses: coverallsapp/github-action@release/v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ./coverage/lcov.net7.0.info + file: ./coverage/lcov.net7.0.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 7e1b2e7ab277607f6e87abc18a442a6f814cd7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Naz=C3=A1rio=20Coelho?= Date: Thu, 22 Feb 2024 20:22:45 -0300 Subject: [PATCH 03/22] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7abd176de..a2904c1551 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: uses: coverallsapp/github-action@release/v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ./coverage/lcov.net7.0.info + file: ./coverage/lcov.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 7a626e6bd853e21480f90cfdf57ce3fcbd2b70ee Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:24:32 +0100 Subject: [PATCH 04/22] Change format --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2904c1551..037fd79ada 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,13 +30,13 @@ jobs: - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov + dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/opencover.xml - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@release/v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ./coverage/lcov.info + file: ./coverage/opencover.xml PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 22b4f55f4416ce295b8bc503cc751678e5f76fa6 Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:26:43 +0100 Subject: [PATCH 05/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 037fd79ada..3ab3d42984 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/opencover.xml - name: Coveralls if: matrix.os == 'ubuntu-latest' - uses: coverallsapp/github-action@release/v2 + uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} file: ./coverage/opencover.xml From 4d2e8336777f443624f13bc5c083c8af868a5aa6 Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:29:28 +0100 Subject: [PATCH 06/22] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ab3d42984..c1a724c692 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,13 +30,13 @@ jobs: - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/opencover.xml + dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ./coverage/opencover.xml + file: ./coverage/lcov.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 6f1a5884573d86992f9eb58fc3153b71590c3900 Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:37:34 +0100 Subject: [PATCH 07/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1a724c692..9d7312f13a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov + dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith="./coverage/lcov.info" - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 From 488ddeb755a0bc41fce1910eb768f4c31850c32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vitor=20Naz=C3=A1rio=20Coelho?= Date: Thu, 22 Feb 2024 20:39:00 -0300 Subject: [PATCH 08/22] Update main.yml --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d7312f13a..19d0659e3b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,12 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | dotnet format --verify-no-changes --verbosity diagnostic + - name: TEMP I + run: | + dotnet restore + - name: TEMP II + run: | + dotnet build - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild From 3d5cb34ecdcfb130e37222ca53a5bf6bd6a627ef Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:41:34 +0100 Subject: [PATCH 09/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 19d0659e3b..f818f0969b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith="./coverage/lcov.info" + dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith="./coverage/lcov.net7.0.info" - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 From 74b93589ea2416ef1fe95aa09b4a8ddc97ef11a8 Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:42:31 +0100 Subject: [PATCH 10/22] Update main.yml --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f818f0969b..c620fee20c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,12 +27,6 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | dotnet format --verify-no-changes --verbosity diagnostic - - name: TEMP I - run: | - dotnet restore - - name: TEMP II - run: | - dotnet build - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild From d2bb58e30b6369cd960b34b3a98a07ddec637369 Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:43:37 +0100 Subject: [PATCH 11/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c620fee20c..22a4212f86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ./coverage/lcov.info + file: ./coverage/lcov.net7.0.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 0051d28e0d3a52906937c531a4a290cd2ec7d0ac Mon Sep 17 00:00:00 2001 From: Shargon Date: Fri, 23 Feb 2024 00:47:30 +0100 Subject: [PATCH 12/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 22a4212f86..7d133fe397 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - name: Test run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith="./coverage/lcov.net7.0.info" + dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/lcov.net7.0.info - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 From 01a646c00a1400c9e642c8400a86a5b75bf6fce7 Mon Sep 17 00:00:00 2001 From: Fernando Diaz Toledano Date: Fri, 23 Feb 2024 00:59:20 +0100 Subject: [PATCH 13/22] Avoid add package in other os --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d133fe397..dddb6ac6d8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,9 +27,12 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | dotnet format --verify-no-changes --verbosity diagnostic - - name: Test + - name: Prepare coverage + if: matrix.os == 'ubuntu-latest' run: | find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild + - name: Test + run: | dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/lcov.net7.0.info - name: Coveralls if: matrix.os == 'ubuntu-latest' From 04e38b97b60b8536752ee17f87b06fd227ed934a Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:07:56 -0800 Subject: [PATCH 14/22] Update main.yml --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dddb6ac6d8..828d7d0da4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,11 @@ jobs: find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - name: Test run: | - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/lcov.net7.0.info + dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura + dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json + dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json + dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json + dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:CoverletOutputFormat="lcov" - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 From b277b9eca6931ac5b2530b900e949d5512df5b51 Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:11:52 -0800 Subject: [PATCH 15/22] Update main.yml --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 828d7d0da4..8dec844576 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,16 +34,16 @@ jobs: - name: Test run: | dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura - dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json - dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json - dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json - dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:CoverletOutputFormat="lcov" + dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json + dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json + dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json + dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json /p:CoverletOutputFormat="lcov" - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ./coverage/lcov.net7.0.info + file: ./coverage/cobertura.net7.0.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 7b6035f3ea8090959f6808aa5056d54cd9ea4f29 Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:17:04 -0800 Subject: [PATCH 16/22] Final fix --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8dec844576..2e19fef2d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,17 +33,17 @@ jobs: find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - name: Test run: | - dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura - dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json - dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json - dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json - dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/cobertura /p:MergeWith=${GITHUB_WORKSPACE}/coverage/cobertura.net7.0.json /p:CoverletOutputFormat="lcov" + dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join + dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json + dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json + dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json + dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat="lcov" - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ./coverage/cobertura.net7.0.info + file: ${GITHUB_WORKSPACE}/coverage/join.net7.0.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 71211c780ad927835c2790c3a8d99480089312cc Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:20:55 -0800 Subject: [PATCH 17/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e19fef2d1..3db8e74fc1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,7 @@ jobs: dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json - dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat="lcov" + dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat=lcov - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 From 2c964ac7e7f22b1ebdc5b90859a494fa3ce0a80c Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:22:37 -0800 Subject: [PATCH 18/22] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3db8e74fc1..bc02b94151 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,13 +37,13 @@ jobs: dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json - dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat=lcov + dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat=lcov - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} - file: ${GITHUB_WORKSPACE}/coverage/join.net7.0.info + file: ${GITHUB_WORKSPACE}/coverage/lcov.net7.0.info PublishPackage: if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/') From 2204608189bc3a77aff722666e09e5d0dfc75f58 Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:28:40 -0800 Subject: [PATCH 19/22] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc02b94151..a5619daa5a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,11 +38,14 @@ jobs: dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat=lcov + rm /home/runner/work/neo/neo/coverage/join.net7.0.json - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.GITHUB_TOKEN }} + format: lcov + debug: true file: ${GITHUB_WORKSPACE}/coverage/lcov.net7.0.info PublishPackage: From fa099a998edbb3c7f09d0508341abf7215701381 Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:34:32 -0800 Subject: [PATCH 20/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a5619daa5a..54a5c480c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,6 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} format: lcov - debug: true file: ${GITHUB_WORKSPACE}/coverage/lcov.net7.0.info PublishPackage: From bb2fae23727c5c85f738a3c44a9de8353244bd2a Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:37:01 -0800 Subject: [PATCH 21/22] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54a5c480c2..216e354ddc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat=lcov - rm /home/runner/work/neo/neo/coverage/join.net7.0.json + rm -f /home/runner/work/neo/neo/coverage/join.net7.0.json - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3 From 14ba46ba02b6dbe6b86ed7f0072e6e23f002a37d Mon Sep 17 00:00:00 2001 From: Shargon Date: Thu, 22 Feb 2024 16:43:30 -0800 Subject: [PATCH 22/22] Remove rm In windows fail --- .github/workflows/main.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 216e354ddc..e643529a27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,12 +33,11 @@ jobs: find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild - name: Test run: | - dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join - dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json - dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json - dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/join /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json - dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/join.net7.0.json /p:CoverletOutputFormat=lcov - rm -f /home/runner/work/neo/neo/coverage/join.net7.0.json + dotnet test ./tests/Neo.ConsoleService.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ + dotnet test ./tests/Neo.Cryptography.BLS12_381.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.net7.0.json + dotnet test ./tests/Neo.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.net7.0.json + dotnet test ./tests/Neo.VM.Tests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage-join/ /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.net7.0.json + dotnet test ./tests/Neo.Json.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage-join/coverage.net7.0.json /p:CoverletOutputFormat=lcov - name: Coveralls if: matrix.os == 'ubuntu-latest' uses: coverallsapp/github-action@v2.2.3