Fix snap build

ci/snap.sh

@@ -3,12 +3,9 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-if ! ci/version-check.sh stable; then
 # This job doesn't run within a container, try once to upgrade tooling on a
 # version check failure
-  rustup install stable
+ci/version-check-with-upgrade.sh stable
-  ci/version-check.sh stable
-fi
 
 DRYRUN=
 if [[ -z $BUILDKITE_BRANCH ]]; then

ci/test-bench.sh

@@ -8,13 +8,9 @@ source ci/upload_ci_artifact.sh
 
 eval "$(ci/channel-info.sh)"
 
-if ! ci/version-check.sh nightly; then
 # This job doesn't run within a container, try once to upgrade tooling on a
 # version check failure
-  rustup install nightly
+ci/version-check-with-upgrade.sh nightly
-  rustup default nightly
-  ci/version-check.sh nightly
-fi
 
 _() {
   echo "--- $*"

ci/test-large-network.sh

@@ -4,12 +4,10 @@ set -e
 here=$(dirname "$0")
 cd "$here"/..
 
-if ! ci/version-check.sh stable; then
 # This job doesn't run within a container, try once to upgrade tooling on a
 # version check failure
-  rustup install stable
+ci/version-check-with-upgrade.sh stable
-  ci/version-check.sh stable
+
-fi
 export RUST_BACKTRACE=1
 
 ./fetch-perf-libs.sh

ci/test-stable-perf.sh

@@ -6,13 +6,9 @@ cd "$(dirname "$0")/.."
 # Clear cached json keypair files
 rm -rf "$HOME/.config/solana"
 
-if ! ci/version-check.sh stable; then
 # This job doesn't run within a container, try once to upgrade tooling on a
 # version check failure
-  rustup install stable
+ci/version-check-with-upgrade.sh stable
-  rustup default stable
-  ci/version-check.sh stable
-fi
 
 export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"

ci/version-check-with-upgrade.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+cd "$(dirname "$0")"
+
+channel=${1:-stable}
+if ! ./version-check.sh "$channel"; then
+  rustup install "$channel"
+  rustup default "$channel"
+  ./version-check.sh "$channel"
+fi