Skip to content

Commit 87696ee

Browse files
ci: lint Cargo.toml
1 parent d02d69e commit 87696ee

File tree

2 files changed

+34
-8
lines changed

2 files changed

+34
-8
lines changed

.github/workflows/lint.yaml

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ on:
55
- '**.nix'
66
- '**.rs'
77
- Cargo.*
8+
- flake.lock
89
pull_request:
910
workflow_dispatch:
1011

1112
jobs:
12-
rust-code:
13-
name: Rust code
13+
cargo-toml:
14+
name: Cargo.toml
1415
runs-on: ubuntu-22.04
1516

1617
steps:
@@ -24,7 +25,31 @@ jobs:
2425
log-lines = 500
2526
2627
- name: Set up Magic Nix Cache
27-
uses: DeterminateSystems/magic-nix-cache-action@v2
28+
uses: DeterminateSystems/magic-nix-cache-action@v3
29+
30+
- name: Run taplo lint
31+
run: nix develop -c taplo lint Cargo.toml
32+
33+
- name: Run taplo fmt
34+
if: always()
35+
run: nix develop -c taplo fmt --check Cargo.toml
36+
37+
rust:
38+
name: Rust
39+
runs-on: ubuntu-22.04
40+
41+
steps:
42+
- name: Clone repository
43+
uses: actions/checkout@v4
44+
45+
- name: Install Nix
46+
uses: DeterminateSystems/nix-installer-action@v9
47+
with:
48+
extra-conf: |
49+
log-lines = 500
50+
51+
- name: Set up Magic Nix Cache
52+
uses: DeterminateSystems/magic-nix-cache-action@v3
2853

2954
- name: Set up build cache
3055
uses: actions/cache@v4
@@ -37,15 +62,15 @@ jobs:
3762
target/
3863
key: build-${{ runner.os }}-${{ hashFiles('Cargo.toml') }}-${{ hashFiles('flake.nix') }}-${{ hashFiles('**.lock') }}
3964

40-
- name: Run cargo clippy
65+
- name: cargo clippy
4166
run: nix develop -c cargo clippy -- -Dwarnings -Wclippy::pedantic
4267

43-
- name: Run cargo fmt
68+
- name: cargo fmt
4469
if: always()
4570
run: nix develop -c cargo fmt --check
4671

47-
nix-flake:
48-
name: Nix flake
72+
nix:
73+
name: Nix
4974
runs-on: ubuntu-22.04
5075

5176
steps:
@@ -59,7 +84,7 @@ jobs:
5984
log-lines = 500
6085
6186
- name: Set up Magic Nix Cache
62-
uses: DeterminateSystems/magic-nix-cache-action@v2
87+
uses: DeterminateSystems/magic-nix-cache-action@v3
6388

6489
- name: Check formatting
6590
run: nix run nixpkgs#alejandra -- -c .

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
mold
5959
pkgsCross.mingwW64.buildPackages.gcc
6060
rust
61+
taplo
6162
unzip
6263
];
6364

0 commit comments

Comments
 (0)