Skip to content

Commit

Permalink
chore(ci): force installation of toolchain for tfhe-lints
Browse files Browse the repository at this point in the history
- also update toolchain.txt to match the tfhe-lint toolchain
  • Loading branch information
IceTDrinker authored and nsarlin-zama committed Mar 5, 2025
1 parent e4e4435 commit ba5fae8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ clippy_versionable: install_rs_check_toolchain
.PHONY: clippy_tfhe_lints # Run clippy lints on tfhe-lints
clippy_tfhe_lints: install_cargo_dylint # the toolchain is selected with toolchain.toml
cd utils/tfhe-lints && \
rustup toolchain install && \
cargo clippy --all-targets -- --no-deps -D warnings

.PHONY: clippy_all # Run all clippy targets
Expand Down Expand Up @@ -909,6 +910,7 @@ test_versionable: install_rs_build_toolchain
.PHONY: test_tfhe_lints # Run test on tfhe-lints
test_tfhe_lints: install_cargo_dylint
cd utils/tfhe-lints && \
rustup toolchain install && \
cargo test

# The backward compat data repo holds historical binary data but also rust code to generate and load them.
Expand Down
2 changes: 1 addition & 1 deletion toolchain.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2025-02-19
nightly-2025-02-20
6 changes: 3 additions & 3 deletions utils/tfhe-lints/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
crate-type = ["cdylib"]

[dependencies]
clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "ff4a26d442bead94a4c96fb1de967374bc4fbd8e" }
clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "238edf273d195c8e472851ebd60571f77f978ac8" }
dylint_linting = "3.2.1"

[dev-dependencies]
Expand All @@ -21,5 +21,5 @@ tfhe-versionable = "0.4.0"
rustc_private = true

[[example]]
name = "ui"
path = "ui/main.rs"
name = "ui"
path = "ui/main.rs"
3 changes: 2 additions & 1 deletion utils/tfhe-lints/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[toolchain]
channel = "nightly-2024-11-28"
channel = "nightly-2025-02-20"
components = ["llvm-tools-preview", "rustc-dev"]
profile = "default"

0 comments on commit ba5fae8

Please sign in to comment.