From 1cf7dff7340aadb3d3a130130d82f6e61baf87d5 Mon Sep 17 00:00:00 2001
From: epi <epibar052@gmail.com>
Date: Wed, 13 Apr 2022 20:34:16 -0500
Subject: [PATCH] trying again with new ci configs

---
 .github/workflows/check.yml    | 10 ++++++---
 .github/workflows/coverage.yml | 41 ++++++++++++----------------------
 tests/test_heuristics.rs       |  1 -
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 7ce9a88..ea7b3c1 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -27,9 +27,13 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      - uses: actions-rs/cargo@v1
+      - name: Install latest nextest release
+        uses: taiki-e/install-action@nextest
+      - name: Test with latest nextest release
+        uses: actions-rs/cargo@v1
         with:
-          command: test
+          command: nextest
+          args: run --all-targets --all-features
 
   fmt:
     name: Rust fmt
@@ -61,4 +65,4 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets --all-features -- -D warnings -A clippy::deref_addrof -A clippy::mutex-atomic
\ No newline at end of file
+          args: --all-targets --all-features -- -D warnings
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 96ec012..605e19a 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -3,7 +3,8 @@ on: [push]
 name: Code Coverage Pipeline
 
 jobs:
-  upload-coverage:
+  coverage:
+    name: LLVM Coverage
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -11,34 +12,20 @@ jobs:
         with:
           toolchain: nightly
           override: true
+      - name: Update rust
+        run: rustup update
+      - name: Install llvm-tools-preview
+        run: rustup component add llvm-tools-preview
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
       - uses: actions-rs/cargo@v1
         with:
-          command: clean
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features --no-fail-fast
-        env:
-          CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort'
-          RUSTDOCFLAGS: '-Cpanic=abort'
-      - uses: actions-rs/grcov@v0.1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: lcov.info
-          path: lcov.info
-      - name: Convert lcov to xml
-        run: |
-          curl -O https://raw.githubusercontent.com/eriwen/lcov-to-cobertura-xml/master/lcov_cobertura/lcov_cobertura.py
-          chmod +x lcov_cobertura.py
-          ./lcov_cobertura.py ./lcov.info
-      - uses: codecov/codecov-action@v1
+          command: llvm-cov
+          args: clean --workspace
+      - run: cargo llvm-cov --all-features --no-fail-fast --lcov --output-path lcov.info
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.xml
-          name: codecov-umbrella
+          files: lcov.info
           fail_ci_if_error: true
-      - uses: actions/upload-artifact@v2
-        with:
-          name: coverage.xml
-          path: ./coverage.xml
\ No newline at end of file
diff --git a/tests/test_heuristics.rs b/tests/test_heuristics.rs
index 50b7be2..c66f72c 100644
--- a/tests/test_heuristics.rs
+++ b/tests/test_heuristics.rs
@@ -305,7 +305,6 @@ fn heuristics_wildcard_test_with_two_static_wildcards() {
             .and(predicate::str::contains("Got"))
             .and(predicate::str::contains("200"))
             .and(predicate::str::contains("(url length: 32)"))
-            .and(predicate::str::contains("(url length: 96)"))
             .and(predicate::str::contains(
                 "Wildcard response is static; auto-filtering 46",
             )),