From f8fa50dbfe96adda6e32f6383802448a1158fcd6 Mon Sep 17 00:00:00 2001 From: Chengyu Lin Date: Fri, 13 Dec 2024 21:31:04 -0500 Subject: [PATCH] pin the nightly toolchain (#711) --- .github/workflows/build.yml | 4 ++-- scripts/run_benchmarks.m4 | 2 +- scripts/run_tests.sh | 26 +++++++++++++------------- scripts/test_coverage.sh | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6864a9acb..8a584cdba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly + toolchain: nightly-2024-06-25 override: false default: false components: rustfmt @@ -49,7 +49,7 @@ jobs: uses: crate-ci/typos@v1.28.2 - name: Format Check - run: cargo +nightly fmt -- --check + run: cargo +nightly-2024-06-25 fmt -- --check - name: Clippy uses: actions-rs/clippy-check@v1 diff --git a/scripts/run_benchmarks.m4 b/scripts/run_benchmarks.m4 index 1569bb4fb..282c3e2d9 100755 --- a/scripts/run_benchmarks.m4 +++ b/scripts/run_benchmarks.m4 @@ -30,7 +30,7 @@ fi # Run the benchmark binary set -e -cargo +nightly bench +cargo +nightly-2024-06-25 bench # ^^^ TERMINATE YOUR CODE BEFORE THE BOTTOM ARGBASH MARKER ^^^ diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index ba237f301..f9c4c92ae 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -4,16 +4,16 @@ set -e # We want the code to panic if there is an integer overflow export RUSTFLAGS="-C overflow-checks=on" -cargo +nightly test --release -p jf-utils -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-plonk --lib --bins -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-merkle-tree --features gadgets -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-pcs --features test-srs -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-rescue --features gadgets -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-signature --features "bls, schnorr, gadgets" -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-vid --features test-srs -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-aead -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-elgamal --features gadgets -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-vrf -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-prf -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-crhf -- -Zunstable-options --report-time -cargo +nightly test --release -p jf-commitment -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-utils -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-plonk --lib --bins -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-merkle-tree --features gadgets -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-pcs --features test-srs -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-rescue --features gadgets -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-signature --features "bls, schnorr, gadgets" -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-vid --features test-srs -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-aead -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-elgamal --features gadgets -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-vrf -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-prf -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-crhf -- -Zunstable-options --report-time +cargo +nightly-2024-06-25 test --release -p jf-commitment -- -Zunstable-options --report-time diff --git a/scripts/test_coverage.sh b/scripts/test_coverage.sh index 0e9901e0a..6985ed7d4 100755 --- a/scripts/test_coverage.sh +++ b/scripts/test_coverage.sh @@ -10,7 +10,7 @@ export CARGO_INCREMENTAL=0 export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=3 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests" export RUSTDOCFLAGS="" rm -vf ./target/**/*.gcda -cargo +nightly build --features "test-srs, gadgets, bls, schnorr" -cargo +nightly test --lib --features "test-srs, gadgets, bls, schnorr" +cargo +nightly-2024-06-25 build --features "test-srs, gadgets, bls, schnorr" +cargo +nightly-2024-06-25 test --lib --features "test-srs, gadgets, bls, schnorr" grcov . -s . --binary-path ./target/debug/ -t html --branch --ignore-not-existing $IGNORED_FILES -o ./target/debug/coverage/ echo "Coverage report available at target/debug/coverage/index.html."