Skip to content

Commit

Permalink
Update toolchain version (#940)
Browse files Browse the repository at this point in the history
  • Loading branch information
shaharsamocha7 authored Dec 19, 2024
1 parent 172cd35 commit f24cde6
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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:
Expand All @@ -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/[email protected]
Expand All @@ -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

Expand All @@ -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 }}

Expand All @@ -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
Expand All @@ -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
Expand All @@ -168,29 +168,29 @@ 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
steps:
- 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
steps:
- 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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
# <https://github.com/taiki-e/cargo-llvm-cov?tab=readme-ov-file#merge-coverages-generated-under-different-test-conditions>
- 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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2024-11-06"
channel = "nightly-2024-12-17"
2 changes: 1 addition & 1 deletion scripts/clippy.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/rust_fmt.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

cargo +nightly-2024-11-06 fmt --all -- "$@"
cargo +nightly-2024-12-17 fmt --all -- "$@"
2 changes: 1 addition & 1 deletion scripts/test_avx.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"

0 comments on commit f24cde6

Please sign in to comment.