From 8043edcf06cfb496e9726754f5dea800d025ad48 Mon Sep 17 00:00:00 2001 From: sholderbach Date: Tue, 12 Nov 2024 16:14:22 +0100 Subject: [PATCH 1/4] Fix `Cargo.lock` Wasn't commited with the last release or similar. To avoid conflicts --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index a35b5db5..91e68fcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "reedline" -version = "0.35.0" +version = "0.36.0" dependencies = [ "arboard", "chrono", From 9d9275a37d26f3e45a51a221723d25817c3348dd Mon Sep 17 00:00:00 2001 From: sholderbach Date: Tue, 12 Nov 2024 16:18:36 +0100 Subject: [PATCH 2/4] Add CI check for clean repo after tests/checks Should catch forgotten lockfile --- .github/workflows/ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 209a54bd..e2bb3f8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,17 @@ jobs: - name: Tests run: cargo llvm-cov nextest --all ${{ matrix.flags }} --lcov --output-path lcov.info + - name: Check for clean repo + shell: bash + run: | + if [ -n "$(git status --porcelain)" ]; then + echo "there are changes"; + git status --porcelain + exit 1 + else + echo "no changes in working directory"; + fi + - name: Check lockfile run: cargo check --locked ${{ matrix.flags }} --all-targets --all From bcc0968685e618cace03f408b19ca01bc5732822 Mon Sep 17 00:00:00 2001 From: sholderbach Date: Tue, 12 Nov 2024 16:21:05 +0100 Subject: [PATCH 3/4] Remove unused invocation of `cargo llvm-cov` This was forgotten when removing the coverage upload. We still generated the coverage file --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2bb3f8f..67524acb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,8 +37,6 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1.3.4 - name: Setup nextest uses: taiki-e/install-action@nextest - - name: Setup cargo-llvm-cov - uses: taiki-e/install-action@cargo-llvm-cov - name: Rustfmt run: cargo fmt --all -- --check @@ -47,7 +45,7 @@ jobs: run: cargo clippy ${{ matrix.flags }} --all-targets --all -- -D warnings - name: Tests - run: cargo llvm-cov nextest --all ${{ matrix.flags }} --lcov --output-path lcov.info + run: cargo nextest run --all ${{ matrix.flags }} - name: Check for clean repo shell: bash From 3ccfbfed87de927c9d0ef9c3fb414b9b0cd23604 Mon Sep 17 00:00:00 2001 From: sholderbach Date: Tue, 12 Nov 2024 16:25:09 +0100 Subject: [PATCH 4/4] Bump actions/checkout to suppress warning --- .github/workflows/ci.yml | 2 +- .github/workflows/typos.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67524acb..65b0e203 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Rust toolchain uses: actions-rust-lang/setup-rust-toolchain@v1.3.4 diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml index bcc7b12c..16624d28 100644 --- a/.github/workflows/typos.yml +++ b/.github/workflows/typos.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Actions Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check spelling uses: crate-ci/typos@master