From 64b8049273b0e8c48f191089d9fd561a3d5f24be Mon Sep 17 00:00:00 2001
From: Wil Wade <wil.wade@unfinished.com>
Date: Thu, 9 Nov 2023 18:38:20 +0000
Subject: [PATCH 01/11] Switch to use v2 for Calc Code Coverage

---
 .github/workflows/merge-pr.yml         | 2 +-
 .github/workflows/verify-pr-commit.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml
index 6c80bc3bff..306f97e286 100644
--- a/.github/workflows/merge-pr.yml
+++ b/.github/workflows/merge-pr.yml
@@ -66,7 +66,7 @@ jobs:
     name: Merge - Calculate Code Coverage
     # This job currently fails on EKS runners and must be run on standalone until
     # https://www.pivotaltracker.com/story/show/185045668 is resolved.
-    runs-on: [self-hosted, Linux, X64, build, v1]
+    runs-on: [self-hosted, Linux, X64, build, v2]
     container: ghcr.io/libertydsnp/frequency/ci-base-image:1.0.0
     steps:
       - name: Check Out Repo
diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index 78b50488de..5d5d8e9ab7 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -265,7 +265,7 @@ jobs:
     name: Calculate Code Coverage
     # This job currently fails on EKS runners and must be run on standalone until
     # https://www.pivotaltracker.com/story/show/185045668 is resolved.
-    runs-on: [self-hosted, Linux, X64, build, v1]
+    runs-on: [self-hosted, Linux, X64, build, v2]
     container: ghcr.io/libertydsnp/frequency/ci-base-image:1.0.0
     steps:
       - name: Check Out Repo

From 7553d7b10eca4121393f6e811db13fbcc1030426 Mon Sep 17 00:00:00 2001
From: Wil Wade <wil.wade@unfinished.com>
Date: Thu, 9 Nov 2023 18:38:29 +0000
Subject: [PATCH 02/11] Trigger Calc Code Coverage run

---
 .github/workflows/common/codecov/action.yml | 6 ++++++
 .github/workflows/verify-pr-commit.yml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/common/codecov/action.yml b/.github/workflows/common/codecov/action.yml
index 0f978122dd..084a4634b1 100644
--- a/.github/workflows/common/codecov/action.yml
+++ b/.github/workflows/common/codecov/action.yml
@@ -3,8 +3,14 @@ description: Runs cargo llvm-cov
 runs:
   using: "composite"
   steps:
+    - name: Inside Composite 1
+      shell: bash
+      run: echo "Inside Composite before llvm"
     - name: Install cargo-llvm-cov
       uses: taiki-e/install-action@cargo-llvm-cov
+    - name: Inside Composite 2
+      shell: bash
+      run: echo "Inside Composite post llvm"
     - name: Generate code coverage
       shell: bash
       run: |
diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index 5d5d8e9ab7..5ebf73ef2d 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -261,7 +261,7 @@ jobs:
 
   calc-code-coverage:
     needs: changes
-    if: needs.changes.outputs.rust == 'true'
+    # if: needs.changes.outputs.rust == 'true'
     name: Calculate Code Coverage
     # This job currently fails on EKS runners and must be run on standalone until
     # https://www.pivotaltracker.com/story/show/185045668 is resolved.

From 3b37e9a8a518aeb8faeefe995370285afc41c414 Mon Sep 17 00:00:00 2001
From: Wil Wade <wil.wade@unfinished.com>
Date: Fri, 10 Nov 2023 18:02:50 +0000
Subject: [PATCH 03/11] Remove the composite run for testing

---
 .github/workflows/merge-pr.yml         | 18 +++++++++++++++---
 .github/workflows/verify-pr-commit.yml | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml
index 306f97e286..d3e87ceace 100644
--- a/.github/workflows/merge-pr.yml
+++ b/.github/workflows/merge-pr.yml
@@ -71,9 +71,21 @@ jobs:
     steps:
       - name: Check Out Repo
         uses: actions/checkout@v4
-      - name: Generate and Upload Code Coverage
-        id: codecov
-        uses: ./.github/workflows/common/codecov
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Generate code coverage
+        shell: bash
+        run: |
+          cargo llvm-cov -v --no-fail-fast --workspace --lcov --output-path lcov.info \
+          --ignore-filename-regex "^.*\/(node\/|runtime\/|mock\.rs|weights(\.rs)?|benchmarking\.rs|runtime-api/src/lib\.rs).*$" \
+          --exclude "frequency,frequency-cli,frequency-runtime,frequency-service" \
+          --features frequency-lint-check
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v3
+        with:
+          files: lcov.info
+          fail_ci_if_error: false # optional (default = false)
+          verbose: true # optional (default = false)
 
   publish-ci-base-image:
     needs: changes
diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index 5ebf73ef2d..5eb5e99dd5 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -270,9 +270,21 @@ jobs:
     steps:
       - name: Check Out Repo
         uses: actions/checkout@v4
-      - name: Generate and Upload Code Coverage
-        id: codecov
-        uses: ./.github/workflows/common/codecov
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Generate code coverage
+        shell: bash
+        run: |
+          cargo llvm-cov -v --no-fail-fast --workspace --lcov --output-path lcov.info \
+          --ignore-filename-regex "^.*\/(node\/|runtime\/|mock\.rs|weights(\.rs)?|benchmarking\.rs|runtime-api/src/lib\.rs).*$" \
+          --exclude "frequency,frequency-cli,frequency-runtime,frequency-service" \
+          --features frequency-lint-check
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v3
+        with:
+          files: lcov.info
+          fail_ci_if_error: false # optional (default = false)
+          verbose: true # optional (default = false)
 
   # Workaround to handle skipped required check inside matrix
   # https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks

From 302c8cd434fa5fdbe8d8cbfee5d5c221902a3091 Mon Sep 17 00:00:00 2001
From: saisomepalle <117110417+saisomepalle@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:28:11 -0800
Subject: [PATCH 04/11] Update merge-pr.yml

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

diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml
index d3e87ceace..e79ad84b2d 100644
--- a/.github/workflows/merge-pr.yml
+++ b/.github/workflows/merge-pr.yml
@@ -73,6 +73,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Set Swap Space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 20
       - name: Generate code coverage
         shell: bash
         run: |

From 32ba7c72323bccfb98efa0d6d4fae61e256c800c Mon Sep 17 00:00:00 2001
From: saisomepalle <117110417+saisomepalle@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:32:39 -0800
Subject: [PATCH 05/11] Update verify-pr-commit.yml

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

diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index 5eb5e99dd5..274940a72f 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -272,6 +272,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Set Swap Space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 20
       - name: Generate code coverage
         shell: bash
         run: |

From ea7febae63c1279dc2df05fcae2a33935712ec33 Mon Sep 17 00:00:00 2001
From: saisomepalle <117110417+saisomepalle@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:47:55 -0800
Subject: [PATCH 06/11] adding swap support

---
 .github/workflows/action.yml           | 39 ++++++++++++++++++++++++++
 .github/workflows/merge-pr.yml         |  2 +-
 .github/workflows/verify-pr-commit.yml |  2 +-
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/action.yml

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
new file mode 100644
index 0000000000..09cc959859
--- /dev/null
+++ b/.github/workflows/action.yml
@@ -0,0 +1,39 @@
+name: 'Set Swap Space'
+description: 'Add moar swap'
+branding:
+  icon: 'crop'
+  color: 'orange'
+inputs:
+  swap-size-gb:
+    description: 'Swap space to create, in Gigabytes.'
+    required: false
+    default: '10'
+runs:
+  using: "composite"
+  steps:
+    - name: Swap space report before modification
+      shell: bash
+      run: |
+        echo "Memory and swap:"
+        free -h
+        echo
+        swapon --show
+        echo
+    - name: Set Swap
+      shell: bash
+      run: |
+          export SWAP_FILE=$(swapon --show=NAME | tail -n 1)
+          sudo swapoff $SWAP_FILE
+          sudo rm $SWAP_FILE
+          sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
+          sudo chmod 600 $SWAP_FILE
+          sudo mkswap $SWAP_FILE
+          sudo swapon $SWAP_FILE
+    - name: Swap space report after modification
+      shell: bash
+      run: |
+        echo "Memory and swap:"
+        free -h
+        echo
+        swapon --show
+        echo
diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml
index 5a4854d8ce..cc4d89b28d 100644
--- a/.github/workflows/merge-pr.yml
+++ b/.github/workflows/merge-pr.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
+        uses: LibertyDSNP/frequency@code-coverage-runner
         with:
           swap-size-gb: 20
       - name: Generate code coverage
diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index 3a3a1205fe..ab09f64733 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -273,7 +273,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
+        uses: LibertyDSNP/frequency@code-coverage-runner
         with:
           swap-size-gb: 20
       - name: Generate code coverage

From fc286848ef256a9dca161042458731eb9f1a8a2e Mon Sep 17 00:00:00 2001
From: Wil Wade <wil.wade@unfinished.com>
Date: Mon, 20 Nov 2023 08:25:32 -0500
Subject: [PATCH 07/11] Update to use local composite action for swapon

---
 .github/workflows/{ => common/swap}/action.yml | 0
 .github/workflows/merge-pr.yml                 | 2 +-
 .github/workflows/verify-pr-commit.yml         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename .github/workflows/{ => common/swap}/action.yml (100%)

diff --git a/.github/workflows/action.yml b/.github/workflows/common/swap/action.yml
similarity index 100%
rename from .github/workflows/action.yml
rename to .github/workflows/common/swap/action.yml
diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml
index cc4d89b28d..bec4e50227 100644
--- a/.github/workflows/merge-pr.yml
+++ b/.github/workflows/merge-pr.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Set Swap Space
-        uses: LibertyDSNP/frequency@code-coverage-runner
+        uses: ./.github/workflows/common/swap
         with:
           swap-size-gb: 20
       - name: Generate code coverage
diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index ab09f64733..eaa63ef56b 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -273,7 +273,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Set Swap Space
-        uses: LibertyDSNP/frequency@code-coverage-runner
+        uses: ./.github/workflows/common/swap
         with:
           swap-size-gb: 20
       - name: Generate code coverage

From 22636a8bcb59919548715482f4a041f6852cf709 Mon Sep 17 00:00:00 2001
From: Wil Wade <wil.wade@unfinished.com>
Date: Mon, 20 Nov 2023 08:30:16 -0500
Subject: [PATCH 08/11] Remove sudo calls

---
 .github/workflows/common/swap/action.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/common/swap/action.yml b/.github/workflows/common/swap/action.yml
index 09cc959859..058b25ad40 100644
--- a/.github/workflows/common/swap/action.yml
+++ b/.github/workflows/common/swap/action.yml
@@ -23,12 +23,12 @@ runs:
       shell: bash
       run: |
           export SWAP_FILE=$(swapon --show=NAME | tail -n 1)
-          sudo swapoff $SWAP_FILE
-          sudo rm $SWAP_FILE
-          sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
-          sudo chmod 600 $SWAP_FILE
-          sudo mkswap $SWAP_FILE
-          sudo swapon $SWAP_FILE
+          swapoff $SWAP_FILE
+          rm $SWAP_FILE
+          fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
+          chmod 600 $SWAP_FILE
+          mkswap $SWAP_FILE
+          swapon $SWAP_FILE
     - name: Swap space report after modification
       shell: bash
       run: |

From dc0a2a2244d1a971b3c386f52252738cdd798f5f Mon Sep 17 00:00:00 2001
From: Wil Wade <wil.wade@unfinished.com>
Date: Mon, 20 Nov 2023 08:40:45 -0500
Subject: [PATCH 09/11] Update swap creation bash

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

diff --git a/.github/workflows/common/swap/action.yml b/.github/workflows/common/swap/action.yml
index 058b25ad40..1ffb40e741 100644
--- a/.github/workflows/common/swap/action.yml
+++ b/.github/workflows/common/swap/action.yml
@@ -22,9 +22,9 @@ runs:
     - name: Set Swap
       shell: bash
       run: |
-          export SWAP_FILE=$(swapon --show=NAME | tail -n 1)
-          swapoff $SWAP_FILE
-          rm $SWAP_FILE
+          export SWAP_FILE="/tmp/swap"
+          swapoff $SWAP_FILE || true
+          rm -f $SWAP_FILE
           fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
           chmod 600 $SWAP_FILE
           mkswap $SWAP_FILE

From 302bf2207eeb287be575f556cf9dc29288ad2309 Mon Sep 17 00:00:00 2001
From: saisomepalle <117110417+saisomepalle@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:11:01 -0800
Subject: [PATCH 10/11] Update action.yml

---
 .github/workflows/common/swap/action.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/common/swap/action.yml b/.github/workflows/common/swap/action.yml
index 1ffb40e741..77513321ff 100644
--- a/.github/workflows/common/swap/action.yml
+++ b/.github/workflows/common/swap/action.yml
@@ -22,13 +22,14 @@ runs:
     - name: Set Swap
       shell: bash
       run: |
-          export SWAP_FILE="/tmp/swap"
-          swapoff $SWAP_FILE || true
-          rm -f $SWAP_FILE
-          fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
-          chmod 600 $SWAP_FILE
-          mkswap $SWAP_FILE
-          swapon $SWAP_FILE
+        export SWAP_FILE="/tmp/swap"
+        sudo swapoff $SWAP_FILE || true
+        sudo rm -f $SWAP_FILE
+        sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
+        sudo chmod 600 $SWAP_FILE
+        sudo mkswap $SWAP_FILE
+        sudo swapon $SWAP_FILE
+
     - name: Swap space report after modification
       shell: bash
       run: |

From b553870a3b2bbd03169adc9bbd963fcea35fd19d Mon Sep 17 00:00:00 2001
From: saisomepalle <117110417+saisomepalle@users.noreply.github.com>
Date: Wed, 29 Nov 2023 04:17:07 -0800
Subject: [PATCH 11/11] testing runner pod spec changes

---
 .github/workflows/common/swap/action.yml | 40 ------------------------
 .github/workflows/verify-pr-commit.yml   |  4 ---
 2 files changed, 44 deletions(-)
 delete mode 100644 .github/workflows/common/swap/action.yml

diff --git a/.github/workflows/common/swap/action.yml b/.github/workflows/common/swap/action.yml
deleted file mode 100644
index 77513321ff..0000000000
--- a/.github/workflows/common/swap/action.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: 'Set Swap Space'
-description: 'Add moar swap'
-branding:
-  icon: 'crop'
-  color: 'orange'
-inputs:
-  swap-size-gb:
-    description: 'Swap space to create, in Gigabytes.'
-    required: false
-    default: '10'
-runs:
-  using: "composite"
-  steps:
-    - name: Swap space report before modification
-      shell: bash
-      run: |
-        echo "Memory and swap:"
-        free -h
-        echo
-        swapon --show
-        echo
-    - name: Set Swap
-      shell: bash
-      run: |
-        export SWAP_FILE="/tmp/swap"
-        sudo swapoff $SWAP_FILE || true
-        sudo rm -f $SWAP_FILE
-        sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
-        sudo chmod 600 $SWAP_FILE
-        sudo mkswap $SWAP_FILE
-        sudo swapon $SWAP_FILE
-
-    - name: Swap space report after modification
-      shell: bash
-      run: |
-        echo "Memory and swap:"
-        free -h
-        echo
-        swapon --show
-        echo
diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
index eaa63ef56b..2ed5c97f8c 100644
--- a/.github/workflows/verify-pr-commit.yml
+++ b/.github/workflows/verify-pr-commit.yml
@@ -272,10 +272,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
-      - name: Set Swap Space
-        uses: ./.github/workflows/common/swap
-        with:
-          swap-size-gb: 20
       - name: Generate code coverage
         shell: bash
         run: |