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

Install xargo using CI dictated cargo version if available (#9068) (#9092)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2020-03-26 14:02:09 -07:00
committed by GitHub
parent ec76826493
commit 6db39829c8
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci/rust-version.sh
View File

@ -38,6 +38,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
declare toolchain=$1 declare toolchain=$1
if ! cargo +"$toolchain" -V; then if ! cargo +"$toolchain" -V; then
rustup install "$toolchain" rustup install "$toolchain"
rustup default "$toolchain"
cargo +"$toolchain" -V cargo +"$toolchain" -V
fi fi
} }

8
sdk/bpf/scripts/install.sh
View File

@ -22,12 +22,10 @@ download() {
wget "${args[@]}" wget "${args[@]}"
} }
# Install or upgrade xargo # Install xargo
( (
cargo install cargo-update set -ex
cargo install-update-config --version =0.3.19 xargo cargo +"${rust_stable:-}" install xargo
set -e
cargo install-update -i xargo
xargo --version > xargo.md 2>&1 xargo --version > xargo.md 2>&1
) )
# shellcheck disable=SC2181 # shellcheck disable=SC2181