diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2019-06-05 16:09:27 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-06-05 16:09:39 -0700 |
| commit | 0d83008f7ac55d854d9ff2fac8a03c7bd42915d0 (patch) | |
| tree | c1993907cd5f5acd3c8d0bda08c7267c5c76ca39 /library/compiler-builtins | |
| parent | 0774dcdc8b3232d3a87ed8daa7f07dec1b8fc3f7 (diff) | |
| download | rust-0d83008f7ac55d854d9ff2fac8a03c7bd42915d0.tar.gz rust-0d83008f7ac55d854d9ff2fac8a03c7bd42915d0.zip | |
Attempt to fix CI
Diffstat (limited to 'library/compiler-builtins')
| -rw-r--r-- | library/compiler-builtins/ci/azure-install-rust.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/library/compiler-builtins/ci/azure-install-rust.yml b/library/compiler-builtins/ci/azure-install-rust.yml index f44f8c59dc6..d0255f85b27 100644 --- a/library/compiler-builtins/ci/azure-install-rust.yml +++ b/library/compiler-builtins/ci/azure-install-rust.yml @@ -4,17 +4,21 @@ parameters: steps: - bash: | set -e - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN - echo "##vso[task.prependpath]$HOME/.cargo/bin" + if command -v rustup; then + 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 condition: ne( variables['Agent.OS'], 'Windows_NT' ) env: TOOLCHAIN: ${{ parameters.toolchain }} - script: | - curl -sSf -o rustup-init.exe https://win.rustup.rs - rustup-init.exe -y --default-toolchain %TOOLCHAIN%-%TARGET% - echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin + rustup update --no-self-update %TOOLCHAIN%-%TARGET% + rustup default %TOOLCHAIN%-%TARGET% displayName: Install rust condition: eq( variables['Agent.OS'], 'Windows_NT' ) env: |