From 470213418821dae611385d2d8e139e7fbaa8e847 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 18 Sep 2023 10:45:23 -0400
Subject: [PATCH 1/4] Drop cargo-tarpaulin test

We're looking at better ways to get coverage information, and the test
just broke due to command-line arguments changing.

Signed-off-by: mulhern <amulhern@redhat.com>
---
 .github/workflows/nightly.yml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 258e9502..2f276acc 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -37,27 +37,6 @@ jobs:
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
-  tarpaulin:
-    strategy:
-      matrix:
-        include:
-          - toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: ${{ matrix.toolchain }}
-      - name: Install dependencies
-        run: |
-          sudo apt-get -q update
-          sudo apt-get -y install libdevmapper-dev
-      - name: Set toolchain override with sudo
-        run: sudo /home/runner/.cargo/bin/rustup override set ${{ matrix.toolchain }}  # yamllint disable rule:line-length
-      - name: Run all tests on ${{ matrix.toolchain }} toolchain
-        run: sudo PATH=$GITHUB_WORKSPACE/.cargo/bin:$PATH make -f Makefile tarpaulin  # yamllint disable rule:line-length
-
   checks-with-ci-repo:
     runs-on: ubuntu-20.04
     container:

From c51d7654e264673c1f6d4f60072cfc47b480cb7f Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 18 Sep 2023 10:50:28 -0400
Subject: [PATCH 2/4] Remove tarpaulin target in Makefile

Signed-off-by: mulhern <amulhern@redhat.com>
---
 Makefile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Makefile b/Makefile
index ad0b8401..ed98c01c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,20 +20,12 @@ ${HOME}/.cargo/bin/cargo-tree:
 ${HOME}/.cargo/bin/cargo-audit:
 	cargo install cargo-audit
 
-${HOME}/.cargo/bin/cargo-tarpaulin:
-	cargo install cargo-tarpaulin
-
 tree: ${HOME}/.cargo/bin/cargo-tree
 	PATH=${HOME}/.cargo/bin:${PATH} cargo tree
 
 audit: ${HOME}/.cargo/bin/cargo-audit
 	PATH=${HOME}/.cargo/bin:${PATH} cargo audit -D warnings
 
-tarpaulin: ${HOME}/.cargo/bin/cargo-tarpaulin
-	PATH=${HOME}/.cargo/bin:${PATH}  \
-	RUST_BACKTRACE=1 \
-	cargo tarpaulin -v -- --test-threads=1
-
 SET_LOWER_BOUNDS ?=
 test-set-lower-bounds:
 	echo "Testing that SET_LOWER_BOUNDS environment variable is set to a valid path"

From a8bd6fca18cc3433b92d9fb0e233a35ebf93d82f Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 18 Sep 2023 10:57:17 -0400
Subject: [PATCH 3/4] Drop tree target in Makefile

Signed-off-by: mulhern <amulhern@redhat.com>
---
 Makefile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Makefile b/Makefile
index ed98c01c..4ca1b15b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,9 @@ DENY = -D warnings -D future-incompatible -D unused -D rust_2018_idioms -D nonst
 
 CLIPPY_DENY = -D clippy::all -D clippy::cargo -A clippy::multiple-crate-versions
 
-${HOME}/.cargo/bin/cargo-tree:
-	cargo install cargo-tree
-
 ${HOME}/.cargo/bin/cargo-audit:
 	cargo install cargo-audit
 
-tree: ${HOME}/.cargo/bin/cargo-tree
-	PATH=${HOME}/.cargo/bin:${PATH} cargo tree
-
 audit: ${HOME}/.cargo/bin/cargo-audit
 	PATH=${HOME}/.cargo/bin:${PATH} cargo audit -D warnings
 
@@ -90,6 +84,5 @@ yamllint:
 	test
 	test-compare-fedora-versions
 	test-set-lower-bounds
-	tree
 	verify-dependency-bounds
 	yamllint

From d1b641a6466aee7326d389c159ae1e15fda716f1 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 18 Sep 2023 11:02:30 -0400
Subject: [PATCH 4/4] Remove PATH and install mangement for audit task

Signed-off-by: mulhern <amulhern@redhat.com>
---
 .github/workflows/nightly.yml | 3 +++
 Makefile                      | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2f276acc..e452e290 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -34,6 +34,9 @@ jobs:
         run: |
           sudo apt-get -q update
           sudo apt-get -y install libdevmapper-dev
+      - uses: baptiste0928/cargo-install@v2
+        with:
+          crate: cargo-audit
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
diff --git a/Makefile b/Makefile
index 4ca1b15b..9804dd29 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,8 @@ DENY = -D warnings -D future-incompatible -D unused -D rust_2018_idioms -D nonst
 
 CLIPPY_DENY = -D clippy::all -D clippy::cargo -A clippy::multiple-crate-versions
 
-${HOME}/.cargo/bin/cargo-audit:
-	cargo install cargo-audit
-
-audit: ${HOME}/.cargo/bin/cargo-audit
-	PATH=${HOME}/.cargo/bin:${PATH} cargo audit -D warnings
+audit:
+	cargo audit -D warnings
 
 SET_LOWER_BOUNDS ?=
 test-set-lower-bounds: