blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't fiddle with default rust, humans don't like that

This commit is contained in:
Michael Vines 2018-12-18 08:14:21 -08:00
parent 62f36037ea
commit 4b831d58b7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/version-check-with-upgrade.sh
View File

@ -6,6 +6,5 @@ cd "$(dirname "$0")"
channel=${1:-stable} channel=${1:-stable}
if ! ./version-check.sh "$channel"; then if ! ./version-check.sh "$channel"; then
rustup install "$channel" rustup install "$channel"
rustup default "$channel"
./version-check.sh "$channel" ./version-check.sh "$channel"
fi fi

7
ci/version-check.sh
View File

@ -4,8 +4,9 @@ set -e
require() { require() {
declare expectedProgram="$1" declare expectedProgram="$1"
declare expectedVersion="$2" declare expectedVersion="$2"
shift 2
read -r program version _ < <($expectedProgram -V) read -r program version _ < <($expectedProgram "$@" -V)
declare ok=true declare ok=true
[[ $program = "$expectedProgram" ]] || ok=false [[ $program = "$expectedProgram" ]] || ok=false
@ -20,8 +21,8 @@ require() {
case ${1:-stable} in case ${1:-stable} in
nightly) nightly)
require rustc 1.32.[0-9]+-nightly require rustc 1.32.[0-9]+-nightly +nightly
require cargo 1.32.[0-9]+-nightly require cargo 1.32.[0-9]+-nightly +nightly
;; ;;
stable) stable)
require rustc 1.31.[0-9]+ require rustc 1.31.[0-9]+