From 7432463816c5a6efa519d2ccff9f0cc498d4ce71 Mon Sep 17 00:00:00 2001
From: Ashley Anderson <aanderson@hyperfine-research.com>
Date: Sat, 15 Jan 2022 21:02:31 -0500
Subject: [PATCH] Rebase on main. Update coverage CI yet again.

---
 .github/workflows/ci.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf80c499759..cc2588d36ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -260,19 +260,16 @@ jobs:
           components: llvm-tools-preview
       - name: install cargo-llvm-cov
         shell: bash
-        # TODO: this is a workaround for overflowing the command length in windows - hopefully will get merged in cargo-llvm-cov (https://github.com/taiki-e/cargo-llvm-cov/pull/126)
-        run: cargo install --git https://github.com/aganders3/cargo-llvm-cov --branch relative-object-paths cargo-llvm-cov
+        # TODO: this is a workaround for overflowing the command length in
+        # windows - hopefully will get merged in cargo-llvm-cov
+        # (https://github.com/taiki-e/cargo-llvm-cov/pull/126)
+        # TODO: also some version of cargo-llvm-cov stopped taking multiple values for --package
+        run: cargo install --git https://github.com/aganders3/cargo-llvm-cov --branch fix-package-multiple-values cargo-llvm-cov
         # run: |
         #   host=$(rustc -Vv | grep host | sed 's/host: //')
         #   curl -fsSL https://github.com/taiki-e/cargo-llvm-cov/releases/download/v${CARGO_LLVM_COV_VERSION}/cargo-llvm-cov-"$host".tar.gz | tar xzf - -C ~/.cargo/bin
         # env:
         #   CARGO_LLVM_COV_VERSION: 0.1.11
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
-          profile: minimal
-          components: llvm-tools-preview
       - run: |
           cargo llvm-cov clean --workspace
           cargo llvm-cov --package $ALL_PACKAGES --no-report