Skip to content

Commit ccfbb8a

Browse files
committed
Fix merge conflicts
2 parents 5243aaf + 6dab3c9 commit ccfbb8a

File tree

268 files changed

+2173
-2779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+2173
-2779
lines changed

.github/workflows/test-suite.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ jobs:
324324
channel: stable
325325
cache-target: release
326326
components: rustfmt,clippy
327-
bins: cargo-audit
327+
bins: cargo-audit,cargo-deny
328328
- name: Check formatting with cargo fmt
329329
run: make cargo-fmt
330330
- name: Lint code for quality and style with Clippy
@@ -337,6 +337,8 @@ jobs:
337337
run: make arbitrary-fuzz
338338
- name: Run cargo audit
339339
run: make audit-CI
340+
- name: Run cargo deny
341+
run: make deny-CI
340342
- name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
341343
run: CARGO_HOME=$(readlink -f $HOME) make vendor
342344
- name: Markdown-linter

0 commit comments

Comments
 (0)