Skip to content

Commit

Permalink
Fix forgotten Cargo.lock (#850)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
sholderbach authored Nov 12, 2024
1 parent 7a1b344 commit e4860e2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ 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
- 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
Expand All @@ -47,7 +45,18 @@ 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
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e4860e2

Please sign in to comment.