From 982b9d2f958b7c987b9feaf51e8285c75719798a Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 28 Jan 2024 04:16:52 +0000 Subject: [PATCH 1/3] CI: `actions/checkout@v4` --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/lints-beta.yml | 2 +- .github/workflows/lints-stable.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7430cb6..2403d48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: os: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: sudo apt install ${{ matrix.build_deps }} if: matrix.build_deps != '' @@ -38,7 +38,7 @@ jobs: name: Code coverage runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: sudo apt install libpcsclite-dev - name: Install coverage dependencies @@ -52,7 +52,7 @@ jobs: name: Intra-doc links runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: sudo apt install libpcsclite-dev - run: cargo fetch @@ -65,6 +65,6 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check formatting run: cargo fmt -- --check diff --git a/.github/workflows/lints-beta.yml b/.github/workflows/lints-beta.yml index 3129eca..98604b4 100644 --- a/.github/workflows/lints-beta.yml +++ b/.github/workflows/lints-beta.yml @@ -9,7 +9,7 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@beta id: toolchain - run: rustup override set ${{steps.toolchain.outputs.name}} diff --git a/.github/workflows/lints-stable.yml b/.github/workflows/lints-stable.yml index d8bf84a..0aaac1a 100644 --- a/.github/workflows/lints-stable.yml +++ b/.github/workflows/lints-stable.yml @@ -9,7 +9,7 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install build dependencies run: sudo apt install libpcsclite-dev - name: Run clippy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8528d9..c0902c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: asset_suffix: x86_64-darwin.tar.gz steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable id: toolchain - run: rustup override set ${{steps.toolchain.outputs.name}} @@ -106,7 +106,7 @@ jobs: libpcsclite-dev steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable id: toolchain - run: rustup override set ${{steps.toolchain.outputs.name}} From a24de089e05076aed3491c585e443b82c67e8a25 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 28 Jan 2024 04:21:20 +0000 Subject: [PATCH 2/3] CI: Remove pointless timeouts --- .github/workflows/ci.yml | 1 - .github/workflows/lints-beta.yml | 1 - .github/workflows/lints-stable.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2403d48..fe53fdc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,6 @@ jobs: fmt: name: Rustfmt - timeout-minutes: 30 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lints-beta.yml b/.github/workflows/lints-beta.yml index 98604b4..3086096 100644 --- a/.github/workflows/lints-beta.yml +++ b/.github/workflows/lints-beta.yml @@ -6,7 +6,6 @@ on: pull_request jobs: clippy-beta: name: Clippy (beta) - timeout-minutes: 30 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lints-stable.yml b/.github/workflows/lints-stable.yml index 0aaac1a..64d3438 100644 --- a/.github/workflows/lints-stable.yml +++ b/.github/workflows/lints-stable.yml @@ -6,7 +6,6 @@ on: pull_request jobs: clippy: name: Clippy (MSRV) - timeout-minutes: 30 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 137df751fe92f392e2a358dbbe8bd8688fd955ce Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 28 Jan 2024 04:21:51 +0000 Subject: [PATCH 3/3] CI: Fix test job --- .github/workflows/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe53fdc..73cee86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,13 +26,14 @@ jobs: - name: Install build dependencies run: sudo apt install ${{ matrix.build_deps }} if: matrix.build_deps != '' - - name: Install test dependencies - run: cargo install rage - - run: cargo fetch - - name: Build tests - run: cargo build --verbose --tests + - uses: dtolnay/rust-toolchain@stable + id: stable-toolchain + - name: Install test dependencies using latest stable Rust + run: cargo +${{steps.stable-toolchain.outputs.name}} install rage - name: Run tests - run: cargo test --verbose + run: cargo test + - name: Verify working directory is clean + run: git diff --exit-code codecov: name: Code coverage