From c62a1be11744b2c33ed9d26669b9693113ca9a59 Mon Sep 17 00:00:00 2001
From: Morgan Bazalgette <morgan@morganbaz.com>
Date: Wed, 11 Oct 2023 00:04:02 +0100
Subject: [PATCH] ci: use coverpkg for accurate reporting of pkg/gnolang

---
 .github/workflows/gnoland.yml | 6 +++---
 .github/workflows/gnovm.yml   | 8 ++++++--
 .github/workflows/tm2.yml     | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml
index 2b38f254a13..6dae11902fb 100644
--- a/.github/workflows/gnoland.yml
+++ b/.github/workflows/gnoland.yml
@@ -76,7 +76,7 @@ jobs:
           export LOG_DIR="${{ runner.temp }}/logs/test-${{ matrix.goversion }}-gnoland"
           make ${{ matrix.args }}
       - name: Upload Test Log
-        if: always() 
+        if: always()
         uses: actions/upload-artifact@v3
         with:
           name: logs-test-gnoland-go${{ matrix.goversion }}
@@ -84,7 +84,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
         with:
-          name: ${{runner.os}}-coverage-gnoland-${{ matrix.args}}-${{matrix.goversion}}
+          name: ${{ runner.os }}-coverage-gnoland-${{ matrix.args }}-${{ matrix.goversion }}
           path: ./gno.land/coverage.out
 
   upload-coverage:
@@ -99,7 +99,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           directory: ${{ runner.temp }}/coverage
-          token: ${{ secrets.CODECOV_TOKEN }} 
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
 
   docker-integration:
diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
index 71b03b5ca05..363e65c24c3 100644
--- a/.github/workflows/gnovm.yml
+++ b/.github/workflows/gnovm.yml
@@ -77,11 +77,15 @@ jobs:
         run: |
           export GOPATH=$HOME/go
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
+          # prefix check
+          case "${{ matrix.args }}" in _test.gnolang*)
+            GOTEST_FLAGS="$GOTEST_FLAGS -coverpkg github.com/gnolang/gno/gnovm/tests,github.com/gnolang/gno/gnovm/pkg/gnolang"
+          esac
           make ${{ matrix.args }}
       - uses: actions/upload-artifact@v3
         if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
         with:
-          name: ${{runner.os}}-coverage-gnovm-${{ matrix.args}}-${{matrix.goversion}}
+          name: ${{ runner.os }}-coverage-gnovm-${{ matrix.args }}-${{ matrix.goversion }}
           path: ./gnovm/coverage.out
 
   upload-coverage:
@@ -96,6 +100,6 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           directory: ${{ runner.temp }}/coverage
-          token: ${{ secrets.CODECOV_TOKEN }} 
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
 
diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml
index 7b78ccb1e0f..3f175cefa9d 100644
--- a/.github/workflows/tm2.yml
+++ b/.github/workflows/tm2.yml
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
         with:
-          name: ${{runner.os}}-coverage-tm2-${{ matrix.args}}-${{matrix.goversion}}
+          name: ${{runner.os }}-coverage-tm2-${{ matrix.args }}-${{matrix.goversion }}
           path: ./tm2/coverage.out
 
   upload-coverage:
@@ -86,6 +86,6 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           directory: ${{ runner.temp }}/coverage
-          token: ${{ secrets.CODECOV_TOKEN }} 
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}