Skip to content

Commit e4860e2

Browse files
authored
Fix forgotten Cargo.lock (#850)
* Fix `Cargo.lock` Wasn't commited with the last release or similar. To avoid conflicts * Add CI check for clean repo after tests/checks Should catch forgotten lockfile * Remove unused invocation of `cargo llvm-cov` This was forgotten when removing the coverage upload. We still generated the coverage file * Bump actions/checkout to suppress warning
1 parent 7a1b344 commit e4860e2

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.github/workflows/ci.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ jobs:
3131
runs-on: ${{ matrix.platform }}
3232

3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535

3636
- name: Setup Rust toolchain
3737
uses: actions-rust-lang/[email protected]
3838
- name: Setup nextest
3939
uses: taiki-e/install-action@nextest
40-
- name: Setup cargo-llvm-cov
41-
uses: taiki-e/install-action@cargo-llvm-cov
4240

4341
- name: Rustfmt
4442
run: cargo fmt --all -- --check
@@ -47,7 +45,18 @@ jobs:
4745
run: cargo clippy ${{ matrix.flags }} --all-targets --all -- -D warnings
4846

4947
- name: Tests
50-
run: cargo llvm-cov nextest --all ${{ matrix.flags }} --lcov --output-path lcov.info
48+
run: cargo nextest run --all ${{ matrix.flags }}
49+
50+
- name: Check for clean repo
51+
shell: bash
52+
run: |
53+
if [ -n "$(git status --porcelain)" ]; then
54+
echo "there are changes";
55+
git status --porcelain
56+
exit 1
57+
else
58+
echo "no changes in working directory";
59+
fi
5160
5261
- name: Check lockfile
5362
run: cargo check --locked ${{ matrix.flags }} --all-targets --all

.github/workflows/typos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout Actions Repository
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111

1212
- name: Check spelling
1313
uses: crate-ci/typos@master

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)