diff --git a/.github/workflows/queue_and_merge.yml b/.github/workflows/queue_and_merge.yml index dfbf7a22a..89fe201a7 100644 --- a/.github/workflows/queue_and_merge.yml +++ b/.github/workflows/queue_and_merge.yml @@ -99,10 +99,10 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: nightly + toolchain: nightly-2024-06-14 components: rustfmt cache: true - - run: just fmt + - run: just fmt-check docker: name: Docker diff --git a/justfile b/justfile index fcf864935..7f01a764d 100644 --- a/justfile +++ b/justfile @@ -1,3 +1,7 @@ +devs: + rustup toolchain install 1.79.0 --no-self-update --component clippy,rustfmt + rustup toolchain install nightly-2024-06-14 --no-self-update --component clippy,rustfmt + build: cargo build --all @@ -5,7 +9,10 @@ check: cargo check --all fmt: - cargo +nightly fmt --all + cargo +nightly-2024-06-14 fmt --all + +fmt-check: + cargo +nightly-2024-06-14 fmt --all --check test: cargo test