Skip to content

Commit 9f2a627

Browse files
ci: improve workflows (#26)
1 parent 61a5e05 commit 9f2a627

File tree

6 files changed

+89
-2074
lines changed

6 files changed

+89
-2074
lines changed

.github/workflows/ci.yml

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ on:
99
permissions:
1010
contents: read
1111

12-
env:
13-
RUSTFLAGS: '-Dwarnings'
14-
1512
jobs:
16-
test:
17-
name: Test
13+
lint:
14+
name: Lint
1815
runs-on: ubuntu-latest
1916

17+
env:
18+
RUSTFLAGS: '-Dwarnings'
19+
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v5
@@ -27,11 +27,40 @@ jobs:
2727
components: clippy, rustfmt
2828
target: wasm32-unknown-unknown
2929

30-
- name: Check formatting
31-
run: cargo fmt --all --check
30+
- name: Install Cargo Binary Install
31+
uses: cargo-bins/cargo-binstall@main
32+
33+
- name: Install crates
34+
run: cargo binstall -y --force cargo-deny cargo-machete cargo-sort
3235

3336
- name: Lint
3437
run: cargo clippy --all-features --locked
3538

39+
- name: Check dependencies
40+
run: cargo deny check
41+
42+
- name: Check unused dependencies
43+
run: cargo machete
44+
45+
- name: Check manifest formatting
46+
run: cargo sort --workspace --check
47+
48+
- name: Check formatting
49+
run: cargo fmt --all --check
50+
51+
test:
52+
name: Test
53+
runs-on: ubuntu-latest
54+
55+
steps:
56+
- name: Checkout
57+
uses: actions/checkout@v5
58+
59+
- name: Set up Rust toolchain
60+
uses: actions-rust-lang/setup-rust-toolchain@v1
61+
with:
62+
components: clippy, rustfmt
63+
target: wasm32-unknown-unknown
64+
3665
- name: Test
3766
run: cargo test --all-features --locked --release

.pre-commit-config.yaml

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,39 @@
11
repos:
2+
- repo: https://github.com/pre-commit/mirrors-prettier
3+
rev: v3.1.0
4+
hooks:
5+
- id: prettier
6+
language: node
7+
additional_dependencies:
8+
- prettier@^3.6.2
9+
210
- repo: https://github.com/doublify/pre-commit-rust
311
rev: v1.0
412
hooks:
513
- id: fmt
614
- id: clippy
715

8-
- repo: https://github.com/pre-commit/mirrors-prettier
9-
rev: v3.1.0
16+
- repo: https://github.com/EmbarkStudios/cargo-deny
17+
rev: 0.18.4
1018
hooks:
11-
- id: prettier
12-
language: node
13-
additional_dependencies:
14-
- prettier@^3.2.5
19+
- id: cargo-deny
20+
21+
# - repo: https://github.com/bnjbvr/cargo-machete
22+
# rev: ba1bcd4
23+
# hooks:
24+
# - id: cargo-machete
25+
- repo: local
26+
hooks:
27+
- id: cargo-machete
28+
name: cargo-machete
29+
language: rust
30+
entry: cargo machete
31+
types: [file, toml]
32+
files: Cargo\.(toml|lock)
33+
pass_filenames: false
34+
35+
- repo: https://github.com/DevinR528/cargo-sort
36+
rev: v2.0.1
37+
hooks:
38+
- id: cargo-sort
39+
args: ['--workspace']

.prettierrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
"bracketSpacing": false,
33
"printWidth": 120,
44
"singleQuote": true,
5-
"tabWidth": 4,
6-
"trailingComma": "none"
5+
"tabWidth": 4
76
}

0 commit comments

Comments
 (0)