Skip to content

Commit 50cf266

Browse files
committed
Ensure CI lints use rust toolchain available from with the nix dev shell
1 parent 384da85 commit 50cf266

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/rust.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,30 +45,30 @@ jobs:
4545
steps:
4646
- name: "Checkout repo"
4747
uses: actions/checkout@v4
48-
- name: "Install nightly toolchain"
49-
uses: dtolnay/rust-toolchain@nightly
50-
with:
51-
components: clippy
5248
- name: "Use cache"
5349
uses: Swatinem/rust-cache@v2
50+
- name: "Install nix"
51+
uses: DeterminateSystems/determinate-nix-action@main
52+
- name: "Use nix cache"
53+
uses: DeterminateSystems/magic-nix-cache-action@main
5454
- name: "Run linting check"
55-
run: cd payjoin-ffi && bash contrib/lint.sh
55+
run: cd payjoin-ffi && nix develop -c ./contrib/lint.sh
5656

5757
Lint:
5858
runs-on: ubuntu-latest
5959
steps:
6060
- name: "Checkout repo"
6161
uses: actions/checkout@v4
62-
- name: "Install nightly toolchain"
63-
uses: dtolnay/rust-toolchain@nightly
64-
with:
65-
components: clippy
6662
- name: "Use cache"
6763
uses: Swatinem/rust-cache@v2
64+
- name: "Install nix"
65+
uses: DeterminateSystems/determinate-nix-action@main
66+
- name: "Use nix cache"
67+
uses: DeterminateSystems/magic-nix-cache-action@main
6868
- name: "Run code linting"
69-
run: bash contrib/lint.sh
69+
run: nix develop -c ./contrib/lint.sh
7070
- name: "Run documentation linting"
71-
run: RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --all-features --document-private-items
71+
run: nix develop -c -- bash -c 'RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --all-features --document-private-items'
7272

7373
Coverage:
7474
name: Code coverage

0 commit comments

Comments
 (0)