From 3722ee3830e9b0846416389441eed2ac24e8ee1d Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Tue, 6 Feb 2024 17:12:18 +0100 Subject: [PATCH] ci: Pin Rust nightly to 2024-02-01 The newest Rust nightly removed the `stdsimd` feature in favor of more grained features (rust-lang/rust#117372). However, the version of `ahash` we depend on, still requires that feature. New release of `ahash` (0.8.7) contains a fix, but we can't upgrade to it without upgrading Anchor. Pinning Rust nightly seems to be the less intrusive solution for now. --- .github/workflows/lint.yml | 2 +- scripts/format.sh | 4 ++-- scripts/install.sh | 2 +- scripts/lint.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2a033a8197..2a9d4ab81a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -60,5 +60,5 @@ jobs: # here... But without that, the toolchain is just not there! # I will spend more time on debugging this once I can afford burning # more hours. - rustup toolchain install nightly --component clippy,rustfmt + rustup toolchain install nightly-2024-02-01 --component clippy,rustfmt ./scripts/lint.sh diff --git a/scripts/format.sh b/scripts/format.sh index 1134da760e..fb652ad3d4 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -5,5 +5,5 @@ set -e npx nx run-many --target=format --all npx nx run-many --target=lint:fix --all -cargo +nightly fmt --all -cargo clippy --exclude macro-circom --all -- -A clippy::result_large_err -D warnings \ No newline at end of file +cargo +nightly-2024-02-01 fmt --all +cargo clippy --exclude macro-circom --all -- -A clippy::result_large_err -D warnings diff --git a/scripts/install.sh b/scripts/install.sh index be3e999d92..c9ae053431 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -178,7 +178,7 @@ export PATH="${PREFIX}/cargo/bin:${PATH}" rustup component add clippy rustup component add rustfmt -rustup toolchain install nightly --component clippy,rustfmt +rustup toolchain install nightly-2024-02-01 --component clippy,rustfmt cargo install cargo-expand wasm-pack diff --git a/scripts/lint.sh b/scripts/lint.sh index 5b264c1c66..b366b4705f 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -4,7 +4,7 @@ set -e npx nx run-many --target=format:check --all npx nx run-many --target=lint --all -for rust_toolchain in stable nightly; do +for rust_toolchain in stable nightly-2024-02-01; do cargo +"$rust_toolchain" fmt --all -- --check cargo +"$rust_toolchain" clippy \ --workspace \