gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Group showing various rust toolchain versions (#10618)

Browse Source 
* Group showing various rust toolchain versions

* Fix
This commit is contained in:
Ryo Onodera
2020-06-16 13:40:53 +09:00
committed by GitHub
parent 8bd62d78eb
commit b4f86cc67d
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ci/rust-version.sh
View File

@ -38,7 +38,8 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
rustup_install() { rustup_install() {
declare toolchain=$1 declare toolchain=$1
if ! cargo +"$toolchain" -V; then if ! cargo +"$toolchain" -V > /dev/null; then
echo "$0: Missing toolchain? Installing...: $toolchain" >&2
rustup install "$toolchain" rustup install "$toolchain"
cargo +"$toolchain" -V cargo +"$toolchain" -V
fi fi
@ -58,7 +59,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
rustup_install "$rust_nightly" rustup_install "$rust_nightly"
;; ;;
*) *)
echo "Note: ignoring unknown argument: $1" echo "$0: Note: ignoring unknown argument: $1" >&2
;; ;;
esac esac
) )

24
ci/test-checks.sh
View File

@ -1,7 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#
# cargo fmt, cargo clippy
#
set -e set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
@ -10,6 +8,23 @@ source ci/_
source ci/rust-version.sh stable source ci/rust-version.sh stable
source ci/rust-version.sh nightly source ci/rust-version.sh nightly
echo --- build environment
(
set -x
rustup run "$rust_stable" rustc --version --verbose
rustup run "$rust_nightly" rustc --version --verbose
cargo +"$rust_stable" --version --verbose
cargo +"$rust_nightly" --version --verbose
cargo +"$rust_stable" clippy --version --verbose
cargo +"$rust_nightly" clippy --version --verbose
# audit is done only with stable
cargo +"$rust_stable" audit --version
)
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
export RUSTFLAGS="-D warnings" export RUSTFLAGS="-D warnings"
@ -26,10 +41,8 @@ _ ci/order-crates-for-publishing.py
_ cargo +"$rust_stable" fmt --all -- --check _ cargo +"$rust_stable" fmt --all -- --check
# -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
_ cargo +"$rust_nightly" clippy -Zunstable-options --version
_ cargo +"$rust_nightly" clippy -Zunstable-options --workspace --all-targets -- --deny=warnings _ cargo +"$rust_nightly" clippy -Zunstable-options --workspace --all-targets -- --deny=warnings
_ cargo +"$rust_stable" audit --version
_ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008 _ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008
{ {
@ -41,7 +54,6 @@ _ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-202
cd "$project" cd "$project"
_ cargo +"$rust_stable" fmt -- --check _ cargo +"$rust_stable" fmt -- --check
_ cargo +"$rust_nightly" test _ cargo +"$rust_nightly" test
_ cargo +"$rust_nightly" clippy --version
_ cargo +"$rust_nightly" clippy -- --deny=warnings --allow=clippy::missing_safety_doc _ cargo +"$rust_nightly" clippy -- --deny=warnings --allow=clippy::missing_safety_doc
) )
done done