Skip to content

Commit

Permalink
Bump clap to 3.2.24 to work-around clippy failures, and re-enable cli…
Browse files Browse the repository at this point in the history
…ppy on stable in CI (fixes kanidm#313)
  • Loading branch information
micolous committed Apr 27, 2023
1 parent dcb6ebd commit a79df78
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ jobs:
- run: cargo build --workspace --exclude webauthn-authenticator-rs

# Don't run clippy on Windows, we only need to run it on Linux
#
# FIXME: clippy in rust 1.69.0 fails a clap macro expansion
# https://github.com/rust-lang/rust-clippy/issues/10421
- if: runner.os != 'windows' && matrix.rust_version != 'stable'
- if: runner.os != 'windows'
run: cargo clippy --no-deps --workspace --exclude webauthn-authenticator-rs --all-targets

- run: cargo test --workspace --exclude webauthn-authenticator-rs
Expand Down Expand Up @@ -119,10 +116,7 @@ jobs:

# Don't run clippy on Windows unless it is using a Windows-specific
# feature which wasn't checked on Linux.
#
# FIXME: clippy in rust 1.69.0 fails a clap macro expansion
# https://github.com/rust-lang/rust-clippy/issues/10421
- if: (contains(matrix.features, 'windows') || runner.os != 'windows') && matrix.rust_version != 'stable'
- if: contains(matrix.features, 'windows') || runner.os != 'windows'
run: cargo clippy --no-deps -p webauthn-authenticator-rs --all-targets ${{ matrix.features }}

- run: cargo test -p webauthn-authenticator-rs ${{ matrix.features }}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ webauthn-rs-proto = { path = "./webauthn-rs-proto" }

async-std = { version = "1.6", features = ["attributes"] }
base64 = "0.21"
clap = { version = "^3.2", features = ["derive", "env"] }
clap = { version = "^3.2.24", features = ["derive", "env"] }
compact_jwt = "0.2.3"
futures = "^0.3.25"
hex = "0.4.3"
Expand Down

0 comments on commit a79df78

Please sign in to comment.