From bec6e8da6b476630c14b3aa8ee9df8c7cf23ba87 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 17:45:24 +0800
Subject: [PATCH 01/62] upload code cov once

---
 .github/workflows/test.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aba60ba391..1c20701843 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -152,14 +152,9 @@ jobs:
         --cov-branch
         --cov-report xml:coverage.xml
         --cov=vyper
+        --cov-append
         tests/
 
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
-
   core-tests-success:
     if: always()
     # summary result from test matrix.
@@ -212,14 +207,9 @@ jobs:
           --cov-branch \
           --cov-report xml:coverage.xml \
           --cov=vyper \
+          --cov-append
           tests/
 
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
-
   slow-tests-success:
     if: always()
     # summary result from test matrix.
@@ -231,3 +221,13 @@ jobs:
       - name: Check slow tests all succeeded
         if: ${{ needs.fuzzing.result != 'success' }}
         run: exit 1
+
+  code-coverage:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Upload Coverage
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        file: ./coverage.xml

From 5f1226cfc516f18d43069fd9e993f09ca77f08f0 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:01:11 +0800
Subject: [PATCH 02/62] remove backslash

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1c20701843..4848c264c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -153,7 +153,7 @@ jobs:
         --cov-report xml:coverage.xml
         --cov=vyper
         --cov-append
-        tests/
+        tests
 
   core-tests-success:
     if: always()
@@ -208,7 +208,7 @@ jobs:
           --cov-report xml:coverage.xml \
           --cov=vyper \
           --cov-append
-          tests/
+          tests
 
   slow-tests-success:
     if: always()

From e26fead6f818edd45f758de7248dc4a32288fe03 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:06:55 +0800
Subject: [PATCH 03/62] try adding line break

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4848c264c6..5259cf892f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -153,7 +153,7 @@ jobs:
         --cov-report xml:coverage.xml
         --cov=vyper
         --cov-append
-        tests
+        tests/
 
   core-tests-success:
     if: always()
@@ -207,8 +207,8 @@ jobs:
           --cov-branch \
           --cov-report xml:coverage.xml \
           --cov=vyper \
-          --cov-append
-          tests
+          --cov-append \
+          tests/
 
   slow-tests-success:
     if: always()

From e4e108b5a0292cff1f6c0664a2280e72c4497260 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:28:38 +0800
Subject: [PATCH 04/62] set up python

---
 .github/workflows/test.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5259cf892f..d056918390 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -226,6 +226,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.11"
+        cache: "pip"
+  
+    - name: Install dependencies
+      run: pip install .[test]
+
     - name: Upload Coverage
       uses: codecov/codecov-action@v5
       with:

From 5fc75e361594458563d3e08c9f217adcfcd0579c Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:39:41 +0800
Subject: [PATCH 05/62] defer codecov upload to end

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d056918390..9861b3228e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -224,6 +224,7 @@ jobs:
 
   code-coverage:
     runs-on: ubuntu-latest
+    needs: [core-tests-success, slow-tests-success]
 
     steps:
     - uses: actions/checkout@v4

From cdbe0d4dd6dbaa5ce1a8a348705f885e9db1efab Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 19:02:52 +0800
Subject: [PATCH 06/62] upload and download artifacts

---
 .github/workflows/test.yml | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9861b3228e..b4b1faf303 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -155,6 +155,12 @@ jobs:
         --cov-append
         tests/
 
+    - name: Upload coverage artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: coverage-${{ strategy.job-index }}
+        path: .coverage.xml.${{ strategy.job-index }}
+
   core-tests-success:
     if: always()
     # summary result from test matrix.
@@ -209,6 +215,12 @@ jobs:
           --cov=vyper \
           --cov-append \
           tests/
+      
+    - name: Upload coverage artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: coverage-${{ strategy.job-index }}
+        path: .coverage.xml.${{ strategy.job-index }}
 
   slow-tests-success:
     if: always()
@@ -224,7 +236,7 @@ jobs:
 
   code-coverage:
     runs-on: ubuntu-latest
-    needs: [core-tests-success, slow-tests-success]
+    needs: [tests, fuzzing]
 
     steps:
     - uses: actions/checkout@v4
@@ -235,11 +247,21 @@ jobs:
         python-version: "3.11"
         cache: "pip"
   
-    - name: Install dependencies
-      run: pip install .[test]
+    - name: Install coverage
+      run: pip install coverage
+
+    - name: Download coverage artifacts
+      uses: actions/download-artifact@v3
+      with:
+        path: coverage-files
+
+    - name: Combine coverage
+      run: |
+        coverage combine coverage-files/.coverage.*
+        coverage xml
 
     - name: Upload Coverage
       uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
+        file: coverage.xml

From 5b65bd418554491e613ff8ef875adc0a485cfc70 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 21:42:45 +0800
Subject: [PATCH 07/62] add missing job index when creating cov file

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4b1faf303..04d8174f35 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -211,7 +211,7 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-branch \
-          --cov-report xml:coverage.xml \
+          --cov-report xml:coverage.xml.${{ strategy.job-index }} \
           --cov=vyper \
           --cov-append \
           tests/

From 75ebc34821708124a54e426ff56969df8b9f7c0f Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 21:57:15 +0800
Subject: [PATCH 08/62] remove cov append

---
 .github/workflows/test.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04d8174f35..5055607a2e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,9 +150,8 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-branch
-        --cov-report xml:coverage.xml
+        --cov-report xml:coverage.xml.${{ strategy.job-index }}
         --cov=vyper
-        --cov-append
         tests/
 
     - name: Upload coverage artifact
@@ -213,7 +212,6 @@ jobs:
           --cov-branch \
           --cov-report xml:coverage.xml.${{ strategy.job-index }} \
           --cov=vyper \
-          --cov-append \
           tests/
       
     - name: Upload coverage artifact

From 7e0cc2f6c3193fa1a7e514fa4993482a5fafed45 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:15:41 +0800
Subject: [PATCH 09/62] remove leading period

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5055607a2e..e089e9e71e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,7 +158,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: coverage-${{ strategy.job-index }}
-        path: .coverage.xml.${{ strategy.job-index }}
+        path: coverage.xml.${{ strategy.job-index }}
 
   core-tests-success:
     if: always()
@@ -218,7 +218,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: coverage-${{ strategy.job-index }}
-        path: .coverage.xml.${{ strategy.job-index }}
+        path: coverage.xml.${{ strategy.job-index }}
 
   slow-tests-success:
     if: always()

From 109f9a7400b055d3578c37605f30ba7a61f1c0c4 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:33:37 +0800
Subject: [PATCH 10/62] set merge-multiple to true

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e089e9e71e..a0175bbf1a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -252,6 +252,7 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         path: coverage-files
+        merge-multiple: true
 
     - name: Combine coverage
       run: |

From fbdb8bb670d04b7db18a54eb28d588e7a3f18357 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 23:04:46 +0800
Subject: [PATCH 11/62] use v4

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a0175bbf1a..4e5585d5df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -249,7 +249,7 @@ jobs:
       run: pip install coverage
 
     - name: Download coverage artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: coverage-files
         merge-multiple: true

From f6155ec61835adbab7af69b827e6c102d9107e9d Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 23:18:31 +0800
Subject: [PATCH 12/62] bump other v3 to v4

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4e5585d5df..1e8da9a049 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -155,7 +155,7 @@ jobs:
         tests/
 
     - name: Upload coverage artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ strategy.job-index }}
         path: coverage.xml.${{ strategy.job-index }}
@@ -215,7 +215,7 @@ jobs:
           tests/
       
     - name: Upload coverage artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ strategy.job-index }}
         path: coverage.xml.${{ strategy.job-index }}

From 357c0634fd320a79e8b7e5a9fb96e2bfe0323ab9 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Fri, 17 Jan 2025 23:37:41 +0800
Subject: [PATCH 13/62] add github job for unique file

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1e8da9a049..97c2adc0d9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,7 +150,7 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-branch
-        --cov-report xml:coverage.xml.${{ strategy.job-index }}
+        --cov-report xml:coverage.xml.${{ github.job }}-${{ strategy.job-index }}
         --cov=vyper
         tests/
 
@@ -210,7 +210,7 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-branch \
-          --cov-report xml:coverage.xml.${{ strategy.job-index }} \
+          --cov-report xml:coverage.xml.${{ github.job }}-${{ strategy.job-index }} \
           --cov=vyper \
           tests/
       

From c0850149bcbcabeff17c99b64ebab844e63a35ec Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 11:31:59 +0800
Subject: [PATCH 14/62] fix coverage path

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 97c2adc0d9..1fa6adc00f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -157,8 +157,8 @@ jobs:
     - name: Upload coverage artifact
       uses: actions/upload-artifact@v4
       with:
-        name: coverage-${{ strategy.job-index }}
-        path: coverage.xml.${{ strategy.job-index }}
+        name: coverage-${{ github.job }}-${{ strategy.job-index }}
+        path: coverage.xml.${{ github.job }}-${{ strategy.job-index }}
 
   core-tests-success:
     if: always()
@@ -217,8 +217,8 @@ jobs:
     - name: Upload coverage artifact
       uses: actions/upload-artifact@v4
       with:
-        name: coverage-${{ strategy.job-index }}
-        path: coverage.xml.${{ strategy.job-index }}
+        name: coverage-${{ github.job }}-${{ strategy.job-index }}
+        path: coverage.xml.${{ github.job }}-${{ strategy.job-index }}
 
   slow-tests-success:
     if: always()

From 06eacb3d2df74f52365e478d62e61a71fa46a13e Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 12:00:33 +0800
Subject: [PATCH 15/62] remove leading period for combine

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1fa6adc00f..caf3e99526 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -256,7 +256,7 @@ jobs:
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/.coverage.*
+        coverage combine coverage-files/coverage.*
         coverage xml
 
     - name: Upload Coverage

From 929fcd67c5cfdc2ad531b3f4a65ff2537975f0be Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 15:26:44 +0800
Subject: [PATCH 16/62] rename files

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index caf3e99526..1c19145935 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,7 +150,7 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-branch
-        --cov-report xml:coverage.xml.${{ github.job }}-${{ strategy.job-index }}
+        --cov-report xml:coverage-${{ github.job }}-${{ strategy.job-index }}.xml
         --cov=vyper
         tests/
 
@@ -158,7 +158,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        path: coverage.xml.${{ github.job }}-${{ strategy.job-index }}
+        path: coverage-${{ github.job }}-${{ strategy.job-index }}.xml
 
   core-tests-success:
     if: always()
@@ -210,7 +210,7 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-branch \
-          --cov-report xml:coverage.xml.${{ github.job }}-${{ strategy.job-index }} \
+          --cov-report xml:coverage-${{ github.job }}-${{ strategy.job-index }}.xml
           --cov=vyper \
           tests/
       
@@ -218,7 +218,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        path: coverage.xml.${{ github.job }}-${{ strategy.job-index }}
+        path: coverage-${{ github.job }}-${{ strategy.job-index }}.xml
 
   slow-tests-success:
     if: always()

From d30a9d49f1d9265ec0062dd7010031be77f44cbe Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 15:33:02 +0800
Subject: [PATCH 17/62] add line break

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1c19145935..a27fb6b013 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -210,7 +210,7 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-branch \
-          --cov-report xml:coverage-${{ github.job }}-${{ strategy.job-index }}.xml
+          --cov-report xml:coverage-${{ github.job }}-${{ strategy.job-index }}.xml \
           --cov=vyper \
           tests/
       

From de1a070c9ed8d99ccaf182a81480632fff6abc39 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:03:42 +0800
Subject: [PATCH 18/62] rename combine path

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a27fb6b013..555c0e6ce6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -256,7 +256,7 @@ jobs:
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/coverage.*
+        coverage combine coverage-files/
         coverage xml
 
     - name: Upload Coverage

From 6d8d44bf8324ddf27d7d786dcf7aae05fcb46c70 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:18:09 +0800
Subject: [PATCH 19/62] debug step

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 555c0e6ce6..f3542744d7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -254,6 +254,10 @@ jobs:
         path: coverage-files
         merge-multiple: true
 
+    - name: Debug directory
+      run: |
+        ls coverage-files/
+
     - name: Combine coverage
       run: |
         coverage combine coverage-files/

From 8a3f4f9d9f27f2a9a993c4b3df2c9cf1b422408e Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:34:18 +0800
Subject: [PATCH 20/62] upload all files

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f3542744d7..b6f58254b7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,7 +158,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        path: coverage-${{ github.job }}-${{ strategy.job-index }}.xml
+        path: coverage*
 
   core-tests-success:
     if: always()
@@ -218,7 +218,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        path: coverage-${{ github.job }}-${{ strategy.job-index }}.xml
+        path: coverage*
 
   slow-tests-success:
     if: always()

From 3e6cac7871f873210a9dc4c9f00358f03d900eb4 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:55:51 +0800
Subject: [PATCH 21/62] suppress printing

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b6f58254b7..6000f1041e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,7 +150,7 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-branch
-        --cov-report xml:coverage-${{ github.job }}-${{ strategy.job-index }}.xml
+        --cov-report=
         --cov=vyper
         tests/
 
@@ -210,7 +210,7 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-branch \
-          --cov-report xml:coverage-${{ github.job }}-${{ strategy.job-index }}.xml \
+          --cov-report= \
           --cov=vyper \
           tests/
       

From 290942b91eb0969afb1074ae1b52d832cb29fd32 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:56:20 +0800
Subject: [PATCH 22/62] add leading period

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6000f1041e..29600453b8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,7 +158,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        path: coverage*
+        path: .coverage*
 
   core-tests-success:
     if: always()
@@ -218,7 +218,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        path: coverage*
+        path: .coverage*
 
   slow-tests-success:
     if: always()

From 0850d3b5e84ac9f198ffa668e8b920e572ae110d Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 17:14:08 +0800
Subject: [PATCH 23/62] include hidden files

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 29600453b8..6642f3043a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,6 +158,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
+        include-hidden-files: true
         path: .coverage*
 
   core-tests-success:
@@ -218,6 +219,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: coverage-${{ github.job }}-${{ strategy.job-index }}
+        include-hidden-files: true
         path: .coverage*
 
   slow-tests-success:

From 6a52b77da55340df63218584b5456229e91de2dc Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 17:46:03 +0800
Subject: [PATCH 24/62] show hidden

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6642f3043a..24034272f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -258,7 +258,7 @@ jobs:
 
     - name: Debug directory
       run: |
-        ls coverage-files/
+        ls -la coverage-files/
 
     - name: Combine coverage
       run: |

From 6890d6dc2037d34a440c2a7e89e6aeaca22f117b Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 23:02:58 +0800
Subject: [PATCH 25/62] set COVERAGE_PARALLEL

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24034272f4..c72274dcaa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -141,6 +141,8 @@ jobs:
       run: pip freeze
 
     - name: Run tests
+      env:
+        COVERAGE_PARALLEL: True
       run: >
         pytest
         -m "not fuzzing"
@@ -204,6 +206,8 @@ jobs:
       run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/master/test_durations" -o .test_durations
 
     - name: Run tests
+      env:
+        COVERAGE_PARALLEL: True
       run: |
         pytest \
           -m "fuzzing" \

From f6de1336f0d39b7317525b7b5782cd2cf3ec6e49 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 23:40:39 +0800
Subject: [PATCH 26/62] Revert "set COVERAGE_PARALLEL"

This reverts commit 6890d6dc2037d34a440c2a7e89e6aeaca22f117b.
---
 .github/workflows/test.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c72274dcaa..24034272f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -141,8 +141,6 @@ jobs:
       run: pip freeze
 
     - name: Run tests
-      env:
-        COVERAGE_PARALLEL: True
       run: >
         pytest
         -m "not fuzzing"
@@ -206,8 +204,6 @@ jobs:
       run: curl --location "https://raw.githubusercontent.com/vyperlang/vyper-test-durations/master/test_durations" -o .test_durations
 
     - name: Run tests
-      env:
-        COVERAGE_PARALLEL: True
       run: |
         pytest \
           -m "fuzzing" \

From 1fa4f5c61e1635e642c3047da1b9a2251ecd1978 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sat, 18 Jan 2025 23:41:28 +0800
Subject: [PATCH 27/62] set parallel in setup.cfg

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 5998961ee8..159de191ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,3 +33,6 @@ markers =
 	fuzzing: Run Hypothesis fuzz test suite (deselect with '-m "not fuzzing"')
 	requires_evm_version(version): Mark tests that require at least a specific EVM version and would throw `EvmVersionException` otherwise
 	venom_xfail: mark a test case as a regression (expected to fail) under the venom pipeline
+
+[coverage:run]
+parallel = True

From 5a5907610af3adf74d549e6717549cd8178736df Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 00:06:41 +0800
Subject: [PATCH 28/62] set cov config flag

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24034272f4..786e65c1b0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -149,6 +149,7 @@ jobs:
         --evm-backend ${{ matrix.evm-backend || 'revm' }}
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
+        --cov-config=setup.cfg
         --cov-branch
         --cov-report=
         --cov=vyper
@@ -210,6 +211,7 @@ jobs:
           --splits 120 \
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
+          --cov-config=setup.cfg \
           --cov-branch \
           --cov-report= \
           --cov=vyper \

From 353a23f9f0f0ea57335a1a7b2837701943c6c083 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 11:52:43 +0800
Subject: [PATCH 29/62] try using coverage directly

---
 .github/workflows/test.yml | 12 ++----------
 setup.cfg                  |  2 ++
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 786e65c1b0..4ce5318ab3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -142,17 +142,13 @@ jobs:
 
     - name: Run tests
       run: >
-        pytest
+        coverage run -m pytest
         -m "not fuzzing"
         --optimize ${{ matrix.opt-mode || 'gas' }}
         --evm-version ${{ matrix.evm-version || 'cancun' }}
         --evm-backend ${{ matrix.evm-backend || 'revm' }}
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
-        --cov-config=setup.cfg
-        --cov-branch
-        --cov-report=
-        --cov=vyper
         tests/
 
     - name: Upload coverage artifact
@@ -206,15 +202,11 @@ jobs:
 
     - name: Run tests
       run: |
-        pytest \
+        coverage run -m pytest \
           -m "fuzzing" \
           --splits 120 \
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
-          --cov-config=setup.cfg \
-          --cov-branch \
-          --cov-report= \
-          --cov=vyper \
           tests/
       
     - name: Upload coverage artifact
diff --git a/setup.cfg b/setup.cfg
index 159de191ed..22a7407198 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,4 +35,6 @@ markers =
 	venom_xfail: mark a test case as a regression (expected to fail) under the venom pipeline
 
 [coverage:run]
+branch = True
 parallel = True
+include = vyper

From 8416d790897ccd1d0c7d553d2aa105dbff8b277d Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 12:03:15 +0800
Subject: [PATCH 30/62] add report section

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 22a7407198..7d3ac33574 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,3 +38,6 @@ markers =
 branch = True
 parallel = True
 include = vyper
+
+[coverage:report]
+include = vyper

From 102ad3ebab2f47e8cf625726a7b8e0e090695ca1 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 13:59:11 +0800
Subject: [PATCH 31/62] specify source

---
 setup.cfg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 7d3ac33574..9c4cf05bd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,4 @@ markers =
 [coverage:run]
 branch = True
 parallel = True
-include = vyper
-
-[coverage:report]
-include = vyper
+source = vyper

From b000f672bd3c5073d2553a26448bb207b59b1963 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:19:43 +0800
Subject: [PATCH 32/62] skip non-fuzzing

---
 .github/workflows/test.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4ce5318ab3..eacf5e9dba 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -149,14 +149,16 @@ jobs:
         --evm-backend ${{ matrix.evm-backend || 'revm' }}
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
+        --cov-branch
+        --cov-report xml:coverage.xml
+        --cov=vyper
         tests/
 
-    - name: Upload coverage artifact
-      uses: actions/upload-artifact@v4
+    - name: Upload Coverage
+      uses: codecov/codecov-action@v5
       with:
-        name: coverage-${{ github.job }}-${{ strategy.job-index }}
-        include-hidden-files: true
-        path: .coverage*
+        token: ${{ secrets.CODECOV_TOKEN }}
+        file: ./coverage.xml
 
   core-tests-success:
     if: always()

From 64108890f823ca1a38bf636377a0572ee713208f Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:20:10 +0800
Subject: [PATCH 33/62] fix command

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eacf5e9dba..e46f4b9778 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -142,7 +142,7 @@ jobs:
 
     - name: Run tests
       run: >
-        coverage run -m pytest
+        pytest
         -m "not fuzzing"
         --optimize ${{ matrix.opt-mode || 'gas' }}
         --evm-version ${{ matrix.evm-version || 'cancun' }}

From 9a94fac194ebc83de44d6af39d3f4e46b2366262 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:39:17 +0800
Subject: [PATCH 34/62] add paths

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 9c4cf05bd7..9ecd666085 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,3 +38,6 @@ markers =
 branch = True
 parallel = True
 source = vyper
+
+[coverage:paths]
+source = vyper/

From c395adcadc6f126fe34bbd0743a76120b494a2a5 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 10:44:18 -0500
Subject: [PATCH 35/62] some fixes

---
 .github/workflows/test.yml | 6 ++++--
 setup.cfg                  | 8 --------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e46f4b9778..0127c7b6cc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -204,13 +204,15 @@ jobs:
 
     - name: Run tests
       run: |
-        coverage run -m pytest \
+        pytest \
           -m "fuzzing" \
           --splits 120 \
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
+          --cov-branch \
+          --cov=vyper \
           tests/
-      
+
     - name: Upload coverage artifact
       uses: actions/upload-artifact@v4
       with:
diff --git a/setup.cfg b/setup.cfg
index 9ecd666085..5998961ee8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,11 +33,3 @@ markers =
 	fuzzing: Run Hypothesis fuzz test suite (deselect with '-m "not fuzzing"')
 	requires_evm_version(version): Mark tests that require at least a specific EVM version and would throw `EvmVersionException` otherwise
 	venom_xfail: mark a test case as a regression (expected to fail) under the venom pipeline
-
-[coverage:run]
-branch = True
-parallel = True
-source = vyper
-
-[coverage:paths]
-source = vyper/

From ad361adb0fcba25ccadbeea49389d17aadf67f29 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 10:58:14 -0500
Subject: [PATCH 36/62] turn off merge-multiple

---
 .github/workflows/test.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0127c7b6cc..0dc7f71f54 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,15 +150,16 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-branch
-        --cov-report xml:coverage.xml
         --cov=vyper
         tests/
 
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v5
+    - name: Upload coverage artifact
+      uses: actions/upload-artifact@v4
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
+        name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
+        include-hidden-files: true
+        path: .coverage*
+        if-no-files-found: error
 
   core-tests-success:
     if: always()
@@ -216,9 +217,10 @@ jobs:
     - name: Upload coverage artifact
       uses: actions/upload-artifact@v4
       with:
-        name: coverage-${{ github.job }}-${{ strategy.job-index }}
+        name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
         path: .coverage*
+        if-no-files-found: error
 
   slow-tests-success:
     if: always()
@@ -251,8 +253,7 @@ jobs:
     - name: Download coverage artifacts
       uses: actions/download-artifact@v4
       with:
-        path: coverage-files
-        merge-multiple: true
+        path: coverage-files-*
 
     - name: Debug directory
       run: |
@@ -260,7 +261,7 @@ jobs:
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/
+        coverage combine coverage-files/**/.coverage
         coverage xml
 
     - name: Upload Coverage

From e484ec6de654bf577d320936179367ce6dd85f89 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 11:04:50 -0500
Subject: [PATCH 37/62] remove wildcard

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0dc7f71f54..795347a9d8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,7 +158,7 @@ jobs:
       with:
         name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
-        path: .coverage*
+        path: .coverage
         if-no-files-found: error
 
   core-tests-success:
@@ -219,7 +219,7 @@ jobs:
       with:
         name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
-        path: .coverage*
+        path: .coverage
         if-no-files-found: error
 
   slow-tests-success:

From 2bb18ff6c3a043c46dcbac5b683aa1c7a864fb04 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 11:13:36 -0500
Subject: [PATCH 38/62] debug

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 795347a9d8..676a731a3e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -257,11 +257,12 @@ jobs:
 
     - name: Debug directory
       run: |
-        ls -la coverage-files/
+        ls -la .
+        ls -la coverage-files*/
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/**/.coverage
+        coverage combine coverage-files**/.coverage
         coverage xml
 
     - name: Upload Coverage

From ae73d7e40c80873bcb6852e63ada6423c4e9bf1d Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 11:28:29 -0500
Subject: [PATCH 39/62] update download-artifacts

---
 .github/workflows/test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 676a731a3e..498e2e70a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -253,16 +253,17 @@ jobs:
     - name: Download coverage artifacts
       uses: actions/download-artifact@v4
       with:
-        path: coverage-files-*
+        pattern: coverage-files-*
+        path: coverage-files
 
     - name: Debug directory
       run: |
         ls -la .
-        ls -la coverage-files*/
+        ls -la coverage-files/
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files**/.coverage
+        coverage combine coverage-files/**/.coverage
         coverage xml
 
     - name: Upload Coverage

From f5fd59f9e34a23fba930258f4b4bcc8bdde63ae1 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 12:01:54 -0500
Subject: [PATCH 40/62] paths

---
 .github/workflows/test.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 498e2e70a0..0e87af040f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -256,6 +256,17 @@ jobs:
         pattern: coverage-files-*
         path: coverage-files
 
+    - name: Create coveragerc
+      run: |
+        echo > .coveragerc <<EOF
+[paths]
+source =
+    /home/runner/work/vyper/vyper
+    /Users/runner/work/vyper/vyper
+    D:\a\vyper\vyper
+        EOF
+
+
     - name: Debug directory
       run: |
         ls -la .
@@ -263,7 +274,7 @@ jobs:
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/**/.coverage
+        coverage combine --debug=pathmap coverage-files/**/.coverage
         coverage xml
 
     - name: Upload Coverage

From 5fdd3184ee3e4f10adecef8b5ee288b60def7c58 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Sun, 19 Jan 2025 13:48:56 -0500
Subject: [PATCH 41/62] Revert "paths"

This reverts commit f5fd59f9e34a23fba930258f4b4bcc8bdde63ae1.
---
 .github/workflows/test.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0e87af040f..498e2e70a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -256,17 +256,6 @@ jobs:
         pattern: coverage-files-*
         path: coverage-files
 
-    - name: Create coveragerc
-      run: |
-        echo > .coveragerc <<EOF
-[paths]
-source =
-    /home/runner/work/vyper/vyper
-    /Users/runner/work/vyper/vyper
-    D:\a\vyper\vyper
-        EOF
-
-
     - name: Debug directory
       run: |
         ls -la .
@@ -274,7 +263,7 @@ source =
 
     - name: Combine coverage
       run: |
-        coverage combine --debug=pathmap coverage-files/**/.coverage
+        coverage combine coverage-files/**/.coverage
         coverage xml
 
     - name: Upload Coverage

From 4e8dc68df79339daa5413b03d1d3b0068e4f5a06 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 12:52:56 +0800
Subject: [PATCH 42/62] set relative files; re-add config to setup.cfg

---
 .github/workflows/test.yml |  4 ++--
 setup.cfg                  | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 498e2e70a0..20eb686493 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -149,7 +149,7 @@ jobs:
         --evm-backend ${{ matrix.evm-backend || 'revm' }}
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
-        --cov-branch
+        --cov-config=setup.cfg
         --cov=vyper
         tests/
 
@@ -210,7 +210,7 @@ jobs:
           --splits 120 \
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
-          --cov-branch \
+          --cov-config=setup.cfg \
           --cov=vyper \
           tests/
 
diff --git a/setup.cfg b/setup.cfg
index 5998961ee8..3d2072327f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,3 +33,13 @@ markers =
 	fuzzing: Run Hypothesis fuzz test suite (deselect with '-m "not fuzzing"')
 	requires_evm_version(version): Mark tests that require at least a specific EVM version and would throw `EvmVersionException` otherwise
 	venom_xfail: mark a test case as a regression (expected to fail) under the venom pipeline
+
+
+[coverage:run]
+branch = True
+parallel = True
+source = vyper
+relative_files = True
+
+[coverage:paths]
+source = vyper/

From 70fa4f8056a10249b09afd9ee63b0fb09664666d Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:09:20 +0800
Subject: [PATCH 43/62] ignore errors

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 3d2072327f..208c07a70b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,3 +43,6 @@ relative_files = True
 
 [coverage:paths]
 source = vyper/
+
+[report]
+ignore_errors = True

From 3f79bd5efc536b3b642d1234f3085b1b55106539 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:06:07 +0800
Subject: [PATCH 44/62] fix report header

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 208c07a70b..72767915c0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -44,5 +44,5 @@ relative_files = True
 [coverage:paths]
 source = vyper/
 
-[report]
+[coverage:report]
 ignore_errors = True

From c5c3ebf512342db75cc3170f7cbcdcfb4521e0aa Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:33:08 +0800
Subject: [PATCH 45/62] try deleting relative_files

---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 72767915c0..7c50bd527e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,7 +39,6 @@ markers =
 branch = True
 parallel = True
 source = vyper
-relative_files = True
 
 [coverage:paths]
 source = vyper/

From caf84ac04bc032af825af5ea023e5f7170fb020f Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:08:07 +0800
Subject: [PATCH 46/62] try using coverage directly

---
 .github/workflows/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 20eb686493..f569e59b5e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -142,6 +142,8 @@ jobs:
 
     - name: Run tests
       run: >
+        coverage run 
+        --rcfile=setup.cfg
         pytest
         -m "not fuzzing"
         --optimize ${{ matrix.opt-mode || 'gas' }}
@@ -149,8 +151,6 @@ jobs:
         --evm-backend ${{ matrix.evm-backend || 'revm' }}
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
-        --cov-config=setup.cfg
-        --cov=vyper
         tests/
 
     - name: Upload coverage artifact
@@ -205,13 +205,13 @@ jobs:
 
     - name: Run tests
       run: |
-        pytest \
+        coverage run \
+          --rcfile=setup.cfg \
+          pytest \
           -m "fuzzing" \
           --splits 120 \
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
-          --cov-config=setup.cfg \
-          --cov=vyper \
           tests/
 
     - name: Upload coverage artifact

From cf34db6e2332894fdda536ca82c75bbfef2bb692 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:11:20 +0800
Subject: [PATCH 47/62] add missing flag

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f569e59b5e..73c7f965fd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -144,7 +144,7 @@ jobs:
       run: >
         coverage run 
         --rcfile=setup.cfg
-        pytest
+        -m pytest
         -m "not fuzzing"
         --optimize ${{ matrix.opt-mode || 'gas' }}
         --evm-version ${{ matrix.evm-version || 'cancun' }}
@@ -207,7 +207,7 @@ jobs:
       run: |
         coverage run \
           --rcfile=setup.cfg \
-          pytest \
+          -m pytest \
           -m "fuzzing" \
           --splits 120 \
           --group ${{ matrix.group }} \

From 00b41b3588bfba492e3cae7eec3a3db5b1731adf Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:15:18 +0800
Subject: [PATCH 48/62] add wildcard for paths

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 73c7f965fd..275f3b6032 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,7 +158,7 @@ jobs:
       with:
         name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
-        path: .coverage
+        path: .coverage*
         if-no-files-found: error
 
   core-tests-success:
@@ -219,7 +219,7 @@ jobs:
       with:
         name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
-        path: .coverage
+        path: .coverage*
         if-no-files-found: error
 
   slow-tests-success:
@@ -263,7 +263,7 @@ jobs:
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/**/.coverage
+        coverage combine coverage-files/**/.coverage*
         coverage xml
 
     - name: Upload Coverage

From d017456ac32e09eb208903cd256905e827ca8c07 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:31:55 +0800
Subject: [PATCH 49/62] Revert "add wildcard for paths"

This reverts commit 00b41b3588bfba492e3cae7eec3a3db5b1731adf.
---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 275f3b6032..73c7f965fd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -158,7 +158,7 @@ jobs:
       with:
         name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
-        path: .coverage*
+        path: .coverage
         if-no-files-found: error
 
   core-tests-success:
@@ -219,7 +219,7 @@ jobs:
       with:
         name: coverage-files-${{ github.job }}-${{ strategy.job-index }}
         include-hidden-files: true
-        path: .coverage*
+        path: .coverage
         if-no-files-found: error
 
   slow-tests-success:
@@ -263,7 +263,7 @@ jobs:
 
     - name: Combine coverage
       run: |
-        coverage combine coverage-files/**/.coverage*
+        coverage combine coverage-files/**/.coverage
         coverage xml
 
     - name: Upload Coverage

From 374f0a46fb7ae4a12b5a923079da156208c484ef Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:31:56 +0800
Subject: [PATCH 50/62] Revert "add missing flag"

This reverts commit cf34db6e2332894fdda536ca82c75bbfef2bb692.
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 73c7f965fd..f569e59b5e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -144,7 +144,7 @@ jobs:
       run: >
         coverage run 
         --rcfile=setup.cfg
-        -m pytest
+        pytest
         -m "not fuzzing"
         --optimize ${{ matrix.opt-mode || 'gas' }}
         --evm-version ${{ matrix.evm-version || 'cancun' }}
@@ -207,7 +207,7 @@ jobs:
       run: |
         coverage run \
           --rcfile=setup.cfg \
-          -m pytest \
+          pytest \
           -m "fuzzing" \
           --splits 120 \
           --group ${{ matrix.group }} \

From 290e16432951bac0efa76b07f1116ec9964226b2 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:31:56 +0800
Subject: [PATCH 51/62] Revert "try using coverage directly"

This reverts commit caf84ac04bc032af825af5ea023e5f7170fb020f.
---
 .github/workflows/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f569e59b5e..20eb686493 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -142,8 +142,6 @@ jobs:
 
     - name: Run tests
       run: >
-        coverage run 
-        --rcfile=setup.cfg
         pytest
         -m "not fuzzing"
         --optimize ${{ matrix.opt-mode || 'gas' }}
@@ -151,6 +149,8 @@ jobs:
         --evm-backend ${{ matrix.evm-backend || 'revm' }}
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
+        --cov-config=setup.cfg
+        --cov=vyper
         tests/
 
     - name: Upload coverage artifact
@@ -205,13 +205,13 @@ jobs:
 
     - name: Run tests
       run: |
-        coverage run \
-          --rcfile=setup.cfg \
-          pytest \
+        pytest \
           -m "fuzzing" \
           --splits 120 \
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
+          --cov-config=setup.cfg \
+          --cov=vyper \
           tests/
 
     - name: Upload coverage artifact

From ba4f92369a5fe64277f9621cd42d849bf1b1672e Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:12:35 +0800
Subject: [PATCH 52/62] move cov flag to config

---
 .github/workflows/test.yml | 2 --
 setup.cfg                  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 20eb686493..ed1137b503 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,7 +150,6 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-config=setup.cfg
-        --cov=vyper
         tests/
 
     - name: Upload coverage artifact
@@ -211,7 +210,6 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-config=setup.cfg \
-          --cov=vyper \
           tests/
 
     - name: Upload coverage artifact
diff --git a/setup.cfg b/setup.cfg
index 7c50bd527e..87f10714c1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,7 +41,7 @@ parallel = True
 source = vyper
 
 [coverage:paths]
-source = vyper/
+source = vyper
 
 [coverage:report]
 ignore_errors = True

From 85ecb7d52f1b9e7f6610ab251198e7f3d1ab6cd5 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:20:16 +0800
Subject: [PATCH 53/62] clean up config

---
 .github/workflows/test.yml | 2 ++
 setup.cfg                  | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ed1137b503..20eb686493 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -150,6 +150,7 @@ jobs:
         ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }}
         ${{ matrix.experimental-codegen && '--experimental-codegen' || '' }}
         --cov-config=setup.cfg
+        --cov=vyper
         tests/
 
     - name: Upload coverage artifact
@@ -210,6 +211,7 @@ jobs:
           --group ${{ matrix.group }} \
           --splitting-algorithm least_duration \
           --cov-config=setup.cfg \
+          --cov=vyper \
           tests/
 
     - name: Upload coverage artifact
diff --git a/setup.cfg b/setup.cfg
index 87f10714c1..9be27413dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,11 +37,6 @@ markers =
 
 [coverage:run]
 branch = True
-parallel = True
-source = vyper
-
-[coverage:paths]
-source = vyper
 
 [coverage:report]
 ignore_errors = True

From 3c286ed2f1c9297f6faba3f3509e5125caa90b87 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:37:13 +0800
Subject: [PATCH 54/62] remove debug step

---
 .github/workflows/test.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 20eb686493..2f8d494b8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -256,11 +256,6 @@ jobs:
         pattern: coverage-files-*
         path: coverage-files
 
-    - name: Debug directory
-      run: |
-        ls -la .
-        ls -la coverage-files/
-
     - name: Combine coverage
       run: |
         coverage combine coverage-files/**/.coverage

From 64df3473aba68e2aec7f739e5c29c3b0c8245fe9 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 20:56:56 +0800
Subject: [PATCH 55/62] remove ignore errors

---
 setup.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9be27413dd..abcfc12b05 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,6 +37,3 @@ markers =
 
 [coverage:run]
 branch = True
-
-[coverage:report]
-ignore_errors = True

From f25cb205781d50e77361c8ea064384f1f4b4a120 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 21:11:35 +0800
Subject: [PATCH 56/62] add source and relative_files

---
 setup.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index abcfc12b05..47e00a6ba4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,3 +37,5 @@ markers =
 
 [coverage:run]
 branch = True
+source = vyper
+relative_files = True

From 0346650cef452e1686e407234b64a8917c47a708 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 21:53:02 +0800
Subject: [PATCH 57/62] exclude version file

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 47e00a6ba4..1a94c4895e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,4 +38,5 @@ markers =
 [coverage:run]
 branch = True
 source = vyper
+omit = vyper/version.py
 relative_files = True

From 34b172668117e240b519025702d8f81bacc69be2 Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:46:21 +0800
Subject: [PATCH 58/62] change file to files

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f8d494b8d..b7f363b6cf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -265,4 +265,4 @@ jobs:
       uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        file: coverage.xml
+        files: coverage.xml

From 1833d2909a0f241f60fa04d06eb066290116c4cd Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Mon, 20 Jan 2025 10:04:15 -0500
Subject: [PATCH 59/62] rename action

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7f363b6cf..cc1b4003bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -234,9 +234,10 @@ jobs:
         if: ${{ needs.fuzzing.result != 'success' }}
         run: exit 1
 
-  code-coverage:
+  consolidate-coverage:
     runs-on: ubuntu-latest
     needs: [tests, fuzzing]
+    description: Consolidate code coverage using `coverage combine` and upload to the codecov app
 
     steps:
     - uses: actions/checkout@v4

From 8c9741e318ff684f0fc4b817f5c38c308b6be187 Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Mon, 20 Jan 2025 10:06:03 -0500
Subject: [PATCH 60/62] fix actions file syntax

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cc1b4003bd..1ec914d2b7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -235,9 +235,10 @@ jobs:
         run: exit 1
 
   consolidate-coverage:
+    # Consolidate code coverage using `coverage combine` and upload
+    # to the codecov app
     runs-on: ubuntu-latest
     needs: [tests, fuzzing]
-    description: Consolidate code coverage using `coverage combine` and upload to the codecov app
 
     steps:
     - uses: actions/checkout@v4

From 65ee215085a617e02f71f44a376bf479dff815eb Mon Sep 17 00:00:00 2001
From: Charles Cooper <cooper.charles.m@gmail.com>
Date: Mon, 20 Jan 2025 10:29:14 -0500
Subject: [PATCH 61/62] add comments

---
 setup.cfg | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 1a94c4895e..4cce85034d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,5 +38,10 @@ markers =
 [coverage:run]
 branch = True
 source = vyper
+
+# this is not available on the CI step that performs `coverage combine`
 omit = vyper/version.py
+
+# allow `coverage combine` to combine reports from heterogeneous OSes.
+# (mainly important for consolidating coverage reports in the CI).
 relative_files = True

From eecfb6d17f6e991e8bb1e6e1193366079773c7df Mon Sep 17 00:00:00 2001
From: tserg <8017125+tserg@users.noreply.github.com>
Date: Mon, 20 Jan 2025 23:47:56 +0800
Subject: [PATCH 62/62] Revert "change file to files"

This reverts commit 34b172668117e240b519025702d8f81bacc69be2.
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ec914d2b7..c9705d5e87 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -267,4 +267,4 @@ jobs:
       uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        files: coverage.xml
+        file: coverage.xml