From 1cae9b42e70c4b65c03e04591c057d98b5081657 Mon Sep 17 00:00:00 2001
From: Cameron Garnham <me@da2ce7.com>
Date: Thu, 3 Aug 2023 10:00:53 +0100
Subject: [PATCH] ci: overhaul coverage workflow

---
 .github/workflows/codecov.yml   | 44 -------------------------
 .github/workflows/coverage.yaml | 58 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 44 deletions(-)
 delete mode 100644 .github/workflows/codecov.yml
 create mode 100644 .github/workflows/coverage.yaml

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
deleted file mode 100644
index 4f8fb02a..00000000
--- a/.github/workflows/codecov.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Upload Code Coverage
-
-on:
-  push:
-  pull_request:
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          components: rustfmt, llvm-tools-preview
-      - name: Build
-        run: cargo build --release
-        env:
-          CARGO_INCREMENTAL: "0"
-          RUSTFLAGS: "-Cinstrument-coverage"
-          RUSTDOCFLAGS: "-Cinstrument-coverage"
-      - name: Install torrent edition tool (needed for testing)
-        run: cargo install imdl
-      - name: Test
-        run: cargo test --all-features --no-fail-fast
-        env:
-          CARGO_INCREMENTAL: "0"
-          RUSTFLAGS: "-Cinstrument-coverage"
-          RUSTDOCFLAGS: "-Cinstrument-coverage"
-      - name: Install grcov
-        run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install grcov; fi
-      - name: Run grcov
-        run: grcov . --binary-path target/debug/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../**' --ignore '/*' -o coverage.lcov
-      - uses: codecov/codecov-action@v3
-        env: 
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        with:
-          files: ./coverage.lcov
-          flags: rust
-          fail_ci_if_error: true # optional (default = false)
\ No newline at end of file
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
new file mode 100644
index 00000000..3dea3d57
--- /dev/null
+++ b/.github/workflows/coverage.yaml
@@ -0,0 +1,58 @@
+name: Coverage
+
+on:
+  push:
+  pull_request:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  report:
+    name: Report
+    runs-on: ubuntu-latest
+    env:
+      CARGO_INCREMENTAL: "0"
+      RUSTFLAGS: "-Z profile -C codegen-units=1 -C inline-threshold=0 -C link-dead-code -C overflow-checks=off -C panic=abort -Z panic_abort_tests"
+      RUSTDOCFLAGS: "-Z profile -C codegen-units=1 -C inline-threshold=0 -C link-dead-code -C overflow-checks=off -C panic=abort -Z panic_abort_tests"
+
+    steps:
+      - id: checkout
+        name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - id: setup
+        name: Setup Toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly
+          components: llvm-tools-preview
+
+      - id: cache
+        name: Enable Workflow Cache
+        uses: Swatinem/rust-cache@v2
+
+      - id: tools
+        name: Install Tools
+        run: cargo install imdl
+
+      - id: check
+        name: Run Build-Checks
+        run: cargo check --workspace --all-targets --all-features
+
+      - id: test
+        name: Run Unit Tests
+        run: cargo test --workspace --all-targets --all-features
+
+      - id: coverage
+        name: Generate Coverage Report
+        uses: alekitto/grcov@v0.2
+
+      - id: upload
+        name: Upload Coverage Report
+        uses: codecov/codecov-action@v3
+        with:
+          files: ${{ steps.coverage.outputs.report }}
+          flag: rust
+          verbose: true
+          fail_ci_if_error: true