Attempt to fix CI

master
Alex Crichton 2019-06-05 16:09:27 -07:00
parent 43bd89914c
commit 20827ad38f
1 changed files with 9 additions and 5 deletions

View File

@ -4,17 +4,21 @@ parameters:
steps: steps:
- bash: | - bash: |
set -e set -e
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN if command -v rustup; then
echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup update $TOOLCHAIN
rustup default $TOOLCHAIN
else
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
echo "##vso[task.prependpath]$HOME/.cargo/bin"
fi
displayName: Install rust displayName: Install rust
condition: ne( variables['Agent.OS'], 'Windows_NT' ) condition: ne( variables['Agent.OS'], 'Windows_NT' )
env: env:
TOOLCHAIN: ${{ parameters.toolchain }} TOOLCHAIN: ${{ parameters.toolchain }}
- script: | - script: |
curl -sSf -o rustup-init.exe https://win.rustup.rs rustup update --no-self-update %TOOLCHAIN%-%TARGET%
rustup-init.exe -y --default-toolchain %TOOLCHAIN%-%TARGET% rustup default %TOOLCHAIN%-%TARGET%
echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
displayName: Install rust displayName: Install rust
condition: eq( variables['Agent.OS'], 'Windows_NT' ) condition: eq( variables['Agent.OS'], 'Windows_NT' )
env: env: