|
1 | 1 | # Documentation: https://aka.ms/yaml
|
2 | 2 |
|
3 | 3 | trigger:
|
4 |
| - batch: true |
5 | 4 | branches:
|
6 | 5 | include:
|
7 |
| - # This is where pull requests from "bors r+" are built. |
8 |
| - - staging |
9 |
| - # This is where pull requests from "bors try" are built. |
10 |
| - - trying |
11 |
| - # Build pull requests. |
12 |
| - - master |
| 6 | + - '*' |
| 7 | + exclude: |
| 8 | + - 'staging.tmp' |
13 | 9 |
|
14 | 10 | jobs:
|
15 | 11 | - job: build
|
@@ -50,14 +46,12 @@ jobs:
|
50 | 46 | condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
|
51 | 47 | displayName: 'Install Rust (Linux/macOS)'
|
52 | 48 |
|
53 |
| - - script: curl -sSf -o rustup-init.exe https://win.rustup.rs && rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN% |
| 49 | + - bash: rustup default $RUSTUP_TOOLCHAIN |
54 | 50 | condition: eq( variables['Agent.OS'], 'Windows_NT' )
|
55 |
| - displayName: 'Install Rust (Windows)' |
| 51 | + displayName: 'Set Rust Toolchain (Windows)' |
56 | 52 |
|
57 |
| - - script: | |
58 |
| - echo ##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin |
59 |
| - condition: eq( variables['Agent.OS'], 'Windows_NT' ) |
60 |
| - displayName: 'Add ~/.cargo/bin to PATH (Windows)' |
| 53 | + - bash: rustup update $RUSTUP_TOOLCHAIN |
| 54 | + displayName: 'Run Rustup Update' |
61 | 55 |
|
62 | 56 | - script: |
|
63 | 57 | rustc -Vv
|
@@ -111,14 +105,12 @@ jobs:
|
111 | 105 | condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
|
112 | 106 | displayName: 'Install Rust (Linux/macOS)'
|
113 | 107 |
|
114 |
| - - script: curl -sSf -o rustup-init.exe https://win.rustup.rs && rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN% |
| 108 | + - bash: rustup default $RUSTUP_TOOLCHAIN |
115 | 109 | condition: eq( variables['Agent.OS'], 'Windows_NT' )
|
116 |
| - displayName: 'Install Rust (Windows)' |
| 110 | + displayName: 'Set Rust Toolchain (Windows)' |
117 | 111 |
|
118 |
| - - script: | |
119 |
| - echo ##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin |
120 |
| - condition: eq( variables['Agent.OS'], 'Windows_NT' ) |
121 |
| - displayName: 'Add ~/.cargo/bin to PATH (Windows)' |
| 112 | + - bash: rustup update $RUSTUP_TOOLCHAIN |
| 113 | + displayName: 'Run Rustup Update' |
122 | 114 |
|
123 | 115 | - script: |
|
124 | 116 | rustc -Vv
|
|
0 commit comments