Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

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

Merged
solana-grimes merged 1 commit into from
Mar 26, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/rust-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
declare toolchain=$1
if ! cargo +"$toolchain" -V; then
rustup install "$toolchain"
rustup default "$toolchain"
cargo +"$toolchain" -V
fi
}
Expand Down
8 changes: 3 additions & 5 deletions sdk/bpf/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ download() {
wget "${args[@]}"
}

# Install or upgrade xargo
# Install xargo
(
cargo install cargo-update
cargo install-update-config --version =0.3.19 xargo
set -e
cargo install-update -i xargo
set -ex
cargo +"${rust_stable:-}" install xargo
xargo --version > xargo.md 2>&1
)
# shellcheck disable=SC2181
Expand Down