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

jackcmay · mergify-bot · commit 10b307eba4d0 · 2020-03-26T19:14:39.000Z
(cherry picked from commit 30bed18)
diff --git a/ci/rust-version.sh b/ci/rust-version.sh
@@ -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
   }
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"`
`38`	`38`	`declare toolchain=$1`
`39`	`39`	`if ! cargo +"$toolchain" -V; then`
`40`	`40`	`rustup install "$toolchain"`
	`41`	`+ rustup default "$toolchain"`
`41`	`42`	`cargo +"$toolchain" -V`
`42`	`43`	`fi`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,10 @@ download() {`
`22`	`22`	`wget "${args[@]}"`
`23`	`23`	`}`
`24`	`24`
`25`		`-# Install or upgrade xargo`
	`25`	`+# Install xargo`
`26`	`26`	`(`
`27`		`- cargo install cargo-update`
`28`		`- cargo install-update-config --version =0.3.19 xargo`
`29`		`- set -e`
`30`		`- cargo install-update -i xargo`
	`27`	`+ set -ex`
	`28`	`+ cargo +"${rust_stable:-}" install xargo`
`31`	`29`	`xargo --version > xargo.md 2>&1`
`32`	`30`	`)`
`33`	`31`	`# shellcheck disable=SC2181`