-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
v1.16: ci: split cargo-clippy into stable and nightly (backport of #3…
…4566) (#34568) * ci: split cargo-clippy into stable and nightly (#34566) * ci: split cargo-clippy into stable and nightly * ci: update mergify (cherry picked from commit 5247be1) # Conflicts: # .mergify.yml # scripts/cargo-clippy.sh * fix conflict * fix clippy rule --------- Co-authored-by: Yihau Chen <a122092487@gmail.com> Co-authored-by: yihau <yihau.chen@icloud.com>
- Loading branch information
1 parent
175b4a7
commit fd1cc01
Showing
4 changed files
with
90 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -o errexit | ||
|
||
here="$(dirname "$0")" | ||
cargo="$(readlink -f "${here}/../cargo")" | ||
|
||
if [[ -z $cargo ]]; then | ||
echo >&2 "Failed to find cargo. Mac readlink doesn't support -f. Consider switching | ||
to gnu readlink with 'brew install coreutils' and then symlink greadlink as | ||
/usr/local/bin/readlink." | ||
exit 1 | ||
fi | ||
|
||
# shellcheck source=ci/rust-version.sh | ||
source "$here/../ci/rust-version.sh" nightly | ||
|
||
# Use nightly clippy, as frozen-abi proc-macro generates a lot of code across | ||
# various crates in this whole monorepo (frozen-abi is enabled only under nightly | ||
# due to the use of unstable rust feature). Likewise, frozen-abi(-macro) crates' | ||
# unit tests are only compiled under nightly. | ||
# Similarly, nightly is desired to run clippy over all of bench files because | ||
# the bench itself isn't stabilized yet... | ||
# ref: https://github.com/rust-lang/rust/issues/66287 | ||
"$here/cargo-for-all-lock-files.sh" -- \ | ||
"+${rust_nightly}" clippy \ | ||
--workspace --all-targets --features dummy-for-ci-check -- \ | ||
--deny=warnings \ | ||
--deny=clippy::default_trait_access \ | ||
--deny=clippy::integer_arithmetic \ | ||
--deny=clippy::used_underscore_binding \ | ||
--allow=clippy::redundant_clone |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -o errexit | ||
|
||
here="$(dirname "$0")" | ||
cargo="$(readlink -f "${here}/../cargo")" | ||
|
||
if [[ -z $cargo ]]; then | ||
>&2 echo "Failed to find cargo. Mac readlink doesn't support -f. Consider switching | ||
to gnu readlink with 'brew install coreutils' and then symlink greadlink as | ||
/usr/local/bin/readlink." | ||
exit 1 | ||
fi | ||
|
||
# shellcheck source=ci/rust-version.sh | ||
source "$here/../ci/rust-version.sh" stable | ||
|
||
# temporarily run stable clippy as well to scan the codebase for | ||
# `redundant_clone`s, which is disabled as nightly clippy is buggy: | ||
# https://github.com/solana-labs/solana/issues/31834 | ||
# | ||
# can't use --all-targets: | ||
# error[E0554]: `#![feature]` may not be used on the stable release channel | ||
"$here/cargo-for-all-lock-files.sh" -- \ | ||
clippy \ | ||
--workspace --tests --bins --examples --features dummy-for-ci-check -- \ | ||
--deny=warnings \ | ||
--deny=clippy::default_trait_access \ | ||
--deny=clippy::integer_arithmetic \ | ||
--deny=clippy::used_underscore_binding |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters