From f24cde6f8de3f1db75d04f87807f052aa889b077 Mon Sep 17 00:00:00 2001 From: shaharsamocha7 <70577611+shaharsamocha7@users.noreply.github.com> Date: Thu, 19 Dec 2024 08:21:10 +0200 Subject: [PATCH] Update toolchain version (#940) --- .github/workflows/benchmarks-pages.yaml | 2 +- .github/workflows/ci.yaml | 50 ++++++++++++------------- .github/workflows/coverage.yaml | 4 +- rust-toolchain.toml | 2 +- scripts/clippy.sh | 2 +- scripts/rust_fmt.sh | 2 +- scripts/test_avx.sh | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/benchmarks-pages.yaml b/.github/workflows/benchmarks-pages.yaml index 5e2f877b3..ef8269911 100644 --- a/.github/workflows/benchmarks-pages.yaml +++ b/.github/workflows/benchmarks-pages.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - name: Run benchmark run: ./scripts/bench.sh -- --output-format bencher | tee output.txt - name: Download previous benchmark data diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a00b5467..a37679771 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,7 +25,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: components: rustfmt - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - run: scripts/rust_fmt.sh --check @@ -36,7 +36,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: components: clippy - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - run: scripts/clippy.sh @@ -46,25 +46,25 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - - run: cargo +nightly-2024-11-06 doc + - run: cargo +nightly-2024-12-17 doc - run-wasm32-wasi-tests: + run-wasm32-wasip1-tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 - targets: wasm32-wasi + toolchain: nightly-2024-12-17 + targets: wasm32-wasip1 - uses: taiki-e/install-action@v2 with: tool: wasmtime - uses: Swatinem/rust-cache@v2 - - run: cargo test --target wasm32-wasi + - run: cargo test --target wasm32-wasip1 env: - CARGO_TARGET_WASM32_WASI_RUNNER: "wasmtime run --" + CARGO_TARGET_WASM32_WASIP1_RUNNER: "wasmtime run --" RUSTFLAGS: -C target-feature=+simd128 run-wasm32-unknown-tests: @@ -73,7 +73,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 targets: wasm32-unknown-unknown - uses: Swatinem/rust-cache@v2 - uses: jetli/wasm-pack-action@v0.4.0 @@ -89,9 +89,9 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - - run: cargo +nightly-2024-11-06 test + - run: cargo +nightly-2024-12-17 test env: RUSTFLAGS: -C target-feature=+neon @@ -104,9 +104,9 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - - run: cargo +nightly-2024-11-06 test + - run: cargo +nightly-2024-12-17 test env: RUSTFLAGS: -C target-cpu=native -C target-feature=+${{ matrix.target-feature }} @@ -116,7 +116,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - name: Run benchmark run: ./scripts/bench.sh -- --output-format bencher | tee output.txt - name: Download previous benchmark data @@ -142,7 +142,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - name: Run benchmark run: ./scripts/bench.sh --features="parallel" -- --output-format bencher | tee output.txt - name: Download previous benchmark data @@ -168,9 +168,9 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - - run: cargo +nightly-2024-11-06 test + - run: cargo +nightly-2024-12-17 test run-slow-tests: runs-on: ubuntu-latest @@ -178,9 +178,9 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - - run: cargo +nightly-2024-11-06 test --release --features="slow-tests" + - run: cargo +nightly-2024-12-17 test --release --features="slow-tests" run-tests-parallel: runs-on: ubuntu-latest @@ -188,9 +188,9 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - - run: cargo +nightly-2024-11-06 test --features="parallel" + - run: cargo +nightly-2024-12-17 test --features="parallel" machete: runs-on: ubuntu-latest @@ -201,9 +201,9 @@ jobs: toolchain: nightly-2024-01-04 - uses: Swatinem/rust-cache@v2 - name: Install Machete - run: cargo +nightly-2024-11-06 install --locked cargo-machete + run: cargo +nightly-2024-12-17 install --locked cargo-machete - name: Run Machete (detect unused dependencies) - run: cargo +nightly-2024-11-06 machete + run: cargo +nightly-2024-12-17 machete all-tests: runs-on: ubuntu-latest @@ -213,7 +213,7 @@ jobs: - run-tests - run-avx-tests - run-neon-tests - - run-wasm32-wasi-tests + - run-wasm32-wasip1-tests - run-slow-tests - run-tests-parallel - machete diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 508e0f11b..34b92be13 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -12,14 +12,14 @@ jobs: - uses: dtolnay/rust-toolchain@master with: components: rustfmt - toolchain: nightly-2024-11-06 + toolchain: nightly-2024-12-17 - uses: Swatinem/rust-cache@v2 - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov # TODO: Merge coverage reports for tests on different architectures. # - name: Generate code coverage - run: cargo +nightly-2024-11-06 llvm-cov --codecov --output-path codecov.json + run: cargo +nightly-2024-12-17 llvm-cov --codecov --output-path codecov.json env: RUSTFLAGS: "-C target-feature=+avx512f" - name: Upload coverage to Codecov diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 85b121b33..690b698f9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2024-11-06" +channel = "nightly-2024-12-17" diff --git a/scripts/clippy.sh b/scripts/clippy.sh index 43f11957e..a3f74f4b8 100755 --- a/scripts/clippy.sh +++ b/scripts/clippy.sh @@ -1,3 +1,3 @@ #!/bin/bash -cargo +nightly-2024-11-06 clippy "$@" --all-targets --all-features -- -D warnings -D future-incompatible \ +cargo +nightly-2024-12-17 clippy "$@" --all-targets --all-features -- -D warnings -D future-incompatible \ -D nonstandard-style -D rust-2018-idioms -D unused diff --git a/scripts/rust_fmt.sh b/scripts/rust_fmt.sh index 9f95485b0..ae4a9f7f8 100755 --- a/scripts/rust_fmt.sh +++ b/scripts/rust_fmt.sh @@ -1,3 +1,3 @@ #!/bin/bash -cargo +nightly-2024-11-06 fmt --all -- "$@" +cargo +nightly-2024-12-17 fmt --all -- "$@" diff --git a/scripts/test_avx.sh b/scripts/test_avx.sh index f7755f61d..cb0ac2445 100755 --- a/scripts/test_avx.sh +++ b/scripts/test_avx.sh @@ -1,4 +1,4 @@ #!/bin/bash # Can be used as a drop in replacement for `cargo test` with avx512f flag on. # For example, `./scripts/test_avx.sh` will run all tests(not only avx). -RUSTFLAGS="-Awarnings -C target-cpu=native -C target-feature=+avx512f -C opt-level=2" cargo +nightly-2024-11-06 test "$@" +RUSTFLAGS="-Awarnings -C target-cpu=native -C target-feature=+avx512f -C opt-level=2" cargo +nightly-2024-12-17 test "$@"