From 6db39829c87aeed805aabe176fca73d6f892a84c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:02:09 -0700
Subject: [PATCH] Install xargo using CI dictated cargo version if available
 (#9068) (#9092)

automerge
---
 ci/rust-version.sh         | 1 +
 sdk/bpf/scripts/install.sh | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ci/rust-version.sh b/ci/rust-version.sh
index f338a340a64ccc..f7a54026a3ce2f 100644
--- 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
index 04ae44ac106dec..67ec3f33f53be6 100755
--- 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