From 0b330706222f9efbce6bb953b302b783f8e7b787 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:36:00 +0200
Subject: [PATCH 1/2] fix(codecov): merge coverage.out for a single upload by
 workflow

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 .github/workflows/gnoland.yml | 31 +++++++++++++++++--------------
 .github/workflows/gnovm.yml   | 33 ++++++++++++++++++---------------
 .github/workflows/tm2.yml     | 33 ++++++++++++++++++---------------
 3 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml
index 09896aaee7b..956c899bc08 100644
--- a/.github/workflows/gnoland.yml
+++ b/.github/workflows/gnoland.yml
@@ -74,22 +74,25 @@ jobs:
           export GOPATH=$HOME/go
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
+      - uses: actions/upload-artifact@v3
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        with:
+          name: ${{runner.os}}-coverage-gnoland-${{ matrix.args}}-${{matrix.goversion}}
+          path: ./gno.land/coverage.out
 
-      # NOTE: Using retry action to manage occasional upload failures to codecov.io, due to API limits.
-      # Refer to issue#3954: https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
-      - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
-        name: Upload coverage to Codecov.io
-        uses: Wandalen/wretry.action@v1.3.0
+  upload-coverage:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all previous coverage artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ runner.temp }}/coverage
+      - name: Upload combined coverage to Codecov
+        uses: codecov/codecov-action@v3
         with:
-          attempt_limit: 3
-          attempt_delay: 30000
-          action: codecov/codecov-action@v3
-          with: |
-            token: ${{ secrets.CODECOV_TOKEN }}
-            name: gno.land
-            flags: gno.land-${{matrix.args}}
-            files: ./gno.land/coverage.out
-            fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
+          directory: ${{ runner.temp }}/coverage
+          # token: ${{ secrets.CODECOV_TOKEN }} 
 
   docker-integration:
     strategy:
diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
index 5ac11805fae..94bb46632f1 100644
--- a/.github/workflows/gnovm.yml
+++ b/.github/workflows/gnovm.yml
@@ -78,20 +78,23 @@ jobs:
           export GOPATH=$HOME/go
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           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}}
+          path: ./gnovm/coverage.out
 
-      # NOTE: Using retry action to manage occasional upload failures to codecov.io, due to API limits.
-      # Refer to issue#3954: https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
-      - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
-        name: Upload coverage to Codecov.io
-        uses: Wandalen/wretry.action@v1.3.0
+  upload-coverage:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all previous coverage artifacts
+        uses: actions/download-artifact@v3
         with:
-          attempt_limit: 3
-          attempt_delay: 30000
-          action: codecov/codecov-action@v3
-          with: |
-            token: ${{ secrets.CODECOV_TOKEN }}
-            name: gnovm
-            verbose: true
-            flags: gnovm-${{matrix.args}}
-            files: ./gnovm/coverage.out
-            fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
+          path: ${{ runner.temp }}/coverage
+      - name: Upload combined coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          directory: ${{ runner.temp }}/coverage
+          # token: ${{ secrets.CODECOV_TOKEN }} 
+
diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml
index 2c116d80f87..421d0164f28 100644
--- a/.github/workflows/tm2.yml
+++ b/.github/workflows/tm2.yml
@@ -68,20 +68,23 @@ jobs:
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
           touch coverage.out
+      - uses: actions/upload-artifact@v3
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        with:
+          name: ${{runner.os}}-coverage-tm2-${{ matrix.args}}-${{matrix.goversion}}
+          path: ./tm2/coverage.out
 
-      # NOTE: Using retry action to manage occasional upload failures to codecov.io, due to API limits.
-      # Refer to issue#3954: https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
-      - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
-        name: Upload coverage to Codecov.io
-        uses: Wandalen/wretry.action@v1.3.0
+  upload-coverage:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all previous coverage artifacts
+        uses: actions/download-artifact@v3
         with:
-          attempt_limit: 3
-          attempt_delay: 30000
-          action: codecov/codecov-action@v3
-          with: |
-            token: ${{ secrets.CODECOV_TOKEN }}
-            name: tm2
-            verbose: true
-            flags: tm2-${{matrix.args}}
-            files: ./tm2/coverage.out
-            fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
+          path: ${{ runner.temp }}/coverage
+      - name: Upload combined coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          directory: ${{ runner.temp }}/coverage
+          # token: ${{ secrets.CODECOV_TOKEN }} 
+

From 4e15554243f1eca61aa4b7b91d427834252d2bd4 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Tue, 3 Oct 2023 17:34:41 +0200
Subject: [PATCH 2/2] chore: lint and add secrets

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 .github/workflows/gnoland.yml | 3 ++-
 .github/workflows/gnovm.yml   | 3 ++-
 .github/workflows/tm2.yml     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml
index 956c899bc08..e2b099c2b92 100644
--- a/.github/workflows/gnoland.yml
+++ b/.github/workflows/gnoland.yml
@@ -92,7 +92,8 @@ 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:
     strategy:
diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
index 94bb46632f1..71b03b5ca05 100644
--- a/.github/workflows/gnovm.yml
+++ b/.github/workflows/gnovm.yml
@@ -96,5 +96,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 421d0164f28..7b78ccb1e0f 100644
--- a/.github/workflows/tm2.yml
+++ b/.github/workflows/tm2.yml
@@ -86,5 +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' }}