diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ad99d9a5..1c84c5c3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -98,18 +98,15 @@ jobs: - name: Test (Unix) 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 - env: - bins: cargo-deb cargo-llvm-cov cargo-binstall + run: ./ci-scripts/run_tests_unix.sh ${{ matrix.output }} - name: Test (Windows) 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' }} 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 diff --git a/src/helpers/extracter.rs b/src/helpers/extracter.rs index e1c91cef..42426693 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(()) }