From 2d7832cde1922292b7d4461e7fd3bc5679ae437c Mon Sep 17 00:00:00 2001 From: Ranadeep Biswas Date: Thu, 28 Nov 2024 10:24:14 +0100 Subject: [PATCH] fix msrv ci --- .github/workflows/rust.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index b5c50ef2e..c51bd18ca 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -131,20 +131,18 @@ jobs: - name: Install cargo-msrv run: | - tar -xzf "cargo-msrv-x86_64-${{ matrix.param.system }}-v*.tgz" \ - -C ~/.cargo/bin --strip-components=1 --wildcards \ - "cargo-msrv-x86_64-${{ matrix.param.system }}-v*/cargo-msrv" + find . -name 'cargo-msrv-x86_64*.tgz' -exec mv {} cargo-msrv.tgz \; + tar -tf cargo-msrv.tgz \ + | grep '/cargo-msrv' \ + | head -n1 \ + | xargs -n1 tar -xzf cargo-msrv.tgz -C ~/.cargo/bin --strip-components=1 cargo msrv --version - - name: Verify MSRV - run: cargo hack msrv verify --output-format=minimal --all-features + - name: Verify and Test Rust version + run: | + cargo hack msrv verify --output-format=minimal --all-features + cargo hack --rust-version test --all-targets --all-features - name: Find MSRV if: ${{ failure() }} run: cargo hack msrv find --min=1.75 --output-format=minimal --all-features - - - name: Build with MSRV - run: cargo hack --rust-version build --all-targets --all-features - - - name: Test with MSRV - run: cargo hack --rust-version test --all-targets --all-features