Don't fiddle with default rust, humans don't like that
This commit is contained in:
parent
62f36037ea
commit
4b831d58b7
|
@ -6,6 +6,5 @@ cd "$(dirname "$0")"
|
|||
channel=${1:-stable}
|
||||
if ! ./version-check.sh "$channel"; then
|
||||
rustup install "$channel"
|
||||
rustup default "$channel"
|
||||
./version-check.sh "$channel"
|
||||
fi
|
||||
|
|
|
@ -4,8 +4,9 @@ set -e
|
|||
require() {
|
||||
declare expectedProgram="$1"
|
||||
declare expectedVersion="$2"
|
||||
shift 2
|
||||
|
||||
read -r program version _ < <($expectedProgram -V)
|
||||
read -r program version _ < <($expectedProgram "$@" -V)
|
||||
|
||||
declare ok=true
|
||||
[[ $program = "$expectedProgram" ]] || ok=false
|
||||
|
@ -20,8 +21,8 @@ require() {
|
|||
|
||||
case ${1:-stable} in
|
||||
nightly)
|
||||
require rustc 1.32.[0-9]+-nightly
|
||||
require cargo 1.32.[0-9]+-nightly
|
||||
require rustc 1.32.[0-9]+-nightly +nightly
|
||||
require cargo 1.32.[0-9]+-nightly +nightly
|
||||
;;
|
||||
stable)
|
||||
require rustc 1.31.[0-9]+
|
||||
|
|
Loading…
Reference in New Issue