From ac22db5e79f1d4fbdea2da5c45c5c08621fb19be Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 14:37:14 +1000
Subject: [PATCH 1/8] Set log level to debug in step "Test"

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ad99d9a5..4b2b58e6 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -100,8 +100,8 @@ jobs:
       if: ${{ matrix.test && matrix.os != 'windows-latest' }}
       run: |
         set -euxo pipefail
-        for bin in $bins; do ./${{ matrix.output }} binstall --no-confirm $bin; done
-        ./${{ matrix.output }} binstall --manifest-path . --no-confirm cargo-binstall
+        for bin in $bins; do ./${{ matrix.output }} binstall --log-level debug --no-confirm $bin; done
+        ./${{ matrix.output }} binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
       env:
         bins: cargo-deb cargo-llvm-cov cargo-binstall
 

From 868f6c2759439dc0b256ec5d30109a9c83ddcdc0 Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 16:13:33 +1000
Subject: [PATCH 2/8] Add more `debug!` to `untar`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 src/helpers/extracter.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/helpers/extracter.rs b/src/helpers/extracter.rs
index fbb9d5c0..c773e21e 100644
--- a/src/helpers/extracter.rs
+++ b/src/helpers/extracter.rs
@@ -44,6 +44,8 @@ fn untar<Filter: FnMut(&Path) -> bool>(
         tar.unpack(path)?;
     }
 
+    debug!("Untaring completed");
+
     Ok(())
 }
 

From 58f0d5f12dfe2f97de404b5a9c3f5132c311c75b Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 16:43:11 +1000
Subject: [PATCH 3/8] Run bins after installation in step "Test"

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4b2b58e6..826545d9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -101,7 +101,9 @@ jobs:
       run: |
         set -euxo pipefail
         for bin in $bins; do ./${{ matrix.output }} binstall --log-level debug --no-confirm $bin; done
+        for bin in $bins; do $HOME/.cargo/bin/${{ matrix.output }} --version; done
         ./${{ matrix.output }} binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
+        cargo binstall --version
       env:
         bins: cargo-deb cargo-llvm-cov cargo-binstall
 

From 4b78d4eb4d67f351e8358e15368c6fcdf277baeb Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 16:52:51 +1000
Subject: [PATCH 4/8] Fix step Test: Run `cargo binstall --help` instead

of `cargo binstall --version` since `--version` does not print the
version of `cargo-binstall`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 826545d9..7a4ede55 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -101,11 +101,13 @@ jobs:
       run: |
         set -euxo pipefail
         for bin in $bins; do ./${{ matrix.output }} binstall --log-level debug --no-confirm $bin; done
-        for bin in $bins; do $HOME/.cargo/bin/${{ matrix.output }} --version; done
+        for bin in $test_bins; do $HOME/.cargo/bin/${{ matrix.output }} --version; done
+        cargo binstall --help >dev/null
         ./${{ matrix.output }} binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
-        cargo binstall --version
+        cargo binstall --help >dev/null
       env:
         bins: cargo-deb cargo-llvm-cov cargo-binstall
+        test_bins: cargo-deb cargo-llvm-cov
 
     - name: Test (Windows)
       if: ${{ matrix.os == 'windows-latest' }}

From 19656b6f45291fef00701f1122b99da8f8396d9a Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 17:02:31 +1000
Subject: [PATCH 5/8] Fix typo in step "Test"

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 7a4ede55..9e39daa1 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -101,7 +101,7 @@ jobs:
       run: |
         set -euxo pipefail
         for bin in $bins; do ./${{ matrix.output }} binstall --log-level debug --no-confirm $bin; done
-        for bin in $test_bins; do $HOME/.cargo/bin/${{ matrix.output }} --version; done
+        for bin in $test_bins; do $HOME/.cargo/bin/$bin --version; done
         cargo binstall --help >dev/null
         ./${{ matrix.output }} binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
         cargo binstall --help >dev/null

From dd24661091e69758b07c6fa826cd997fe26e0efe Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 17:02:53 +1000
Subject: [PATCH 6/8] Test installed bin in step "Test (Windows)"

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9e39daa1..d16bff08 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -113,7 +113,9 @@ jobs:
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
         ./${{ matrix.output }} binstall --no-confirm cargo-binstall
+        cargo binstall --help
         ./${{ matrix.output }} binstall --manifest-path . --no-confirm cargo-binstall
+        cargo binstall --help
 
     - name: Create archive (tgz, linux)
       if: ${{ matrix.os != 'macos-latest' && matrix.os != 'windows-latest' }}

From 9bf1ce30005d847e8bd5fef20fe76f9678e320bc Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 17:11:52 +1000
Subject: [PATCH 7/8] Fix typo in step "Test (Unix)"

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d16bff08..f3c01116 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -102,9 +102,9 @@ jobs:
         set -euxo pipefail
         for bin in $bins; do ./${{ matrix.output }} binstall --log-level debug --no-confirm $bin; done
         for bin in $test_bins; do $HOME/.cargo/bin/$bin --version; done
-        cargo binstall --help >dev/null
+        cargo binstall --help >/dev/null
         ./${{ matrix.output }} binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
-        cargo binstall --help >dev/null
+        cargo binstall --help >/dev/null
       env:
         bins: cargo-deb cargo-llvm-cov cargo-binstall
         test_bins: cargo-deb cargo-llvm-cov

From 5302240829d90aa4f048db8462589a6ad533e867 Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Sat, 11 Jun 2022 18:20:58 +1000
Subject: [PATCH 8/8] Refactor workflow rust: Extract test into script

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 .github/workflows/rust.yml   | 11 +----------
 ci-scripts/run_tests_unix.sh | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100755 ci-scripts/run_tests_unix.sh

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f3c01116..1c84c5c3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -98,16 +98,7 @@ jobs:
 
     - name: Test (Unix)
       if: ${{ matrix.test && matrix.os != 'windows-latest' }}
-      run: |
-        set -euxo pipefail
-        for bin in $bins; do ./${{ matrix.output }} binstall --log-level debug --no-confirm $bin; done
-        for bin in $test_bins; do $HOME/.cargo/bin/$bin --version; done
-        cargo binstall --help >/dev/null
-        ./${{ matrix.output }} binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
-        cargo binstall --help >/dev/null
-      env:
-        bins: cargo-deb cargo-llvm-cov cargo-binstall
-        test_bins: cargo-deb cargo-llvm-cov
+      run: ./ci-scripts/run_tests_unix.sh ${{ matrix.output }}
 
     - name: Test (Windows)
       if: ${{ matrix.os == 'windows-latest' }}
diff --git a/ci-scripts/run_tests_unix.sh b/ci-scripts/run_tests_unix.sh
new file mode 100755
index 00000000..dbc25abd
--- /dev/null
+++ b/ci-scripts/run_tests_unix.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+bins="cargo-deb cargo-llvm-cov cargo-binstall"
+test_bins="cargo-deb cargo-llvm-cov"
+
+# Install binaries using cargo-binstall
+for bin in $bins; do
+    "./$1" binstall --log-level debug --no-confirm "$bin"
+done
+
+# Test that the installed binaries can be run
+for bin in $test_bins; do
+    "$HOME/.cargo/bin/$bin" --version
+done
+cargo binstall --help >/dev/null
+
+# Install binaries using `--manifest-path`
+"./$1" binstall --log-level debug --manifest-path . --no-confirm cargo-binstall
+# Test that the installed binaries can be run
+cargo binstall --help >/dev/null