Skip to content

Commit 37d3d28

Browse files
committed
Merge branch 'patch/1bde4cb'
2 parents 6017c19 + 9410742 commit 37d3d28

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/workflows/check.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
node-version: "20.9.0"
1313
- uses: actions/checkout@v4
1414
- run: npm ci
15-
- run: npm run check
15+
- run: npm run check-js
1616
lint-rust:
1717
name: lint rust
1818
runs-on: ubuntu-latest
@@ -29,7 +29,4 @@ jobs:
2929
with:
3030
packages: libgtk-3-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev
3131
version: 1.0
32-
- name: Run clippy
33-
run: cargo clippy --all --tests -- -Dwarnings
34-
- name: Check formatting
35-
run: cargo fmt --all --check
32+
- run: npm run check-rs

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"start": "vite",
99
"build": "vite build",
1010
"preview": "vite preview",
11-
"check": "scripts/check",
11+
"check": "scripts/check-js && scripts/check-rs",
12+
"check-js": "scripts/check-js",
13+
"check-rs": "scripts/check-rs",
1214
"format": "npx prettier '**/*.@(ts|js|svelte|json|css|html|yml)' --write",
1315
"tauri": "npx tauri"
1416
},
File renamed without changes.

scripts/check-rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
set -e
3+
4+
cargo check --manifest-path ./src-tauri/Cargo.toml
5+
cargo clippy --manifest-path ./src-tauri/Cargo.toml -- -Dwarnings
6+
cargo fmt --manifest-path ./src-tauri/Cargo.toml --check

0 commit comments

Comments
 (0)