Skip to content

Commit 2ef31a7

Browse files
authored
Merge pull request rust-osdev#40 from rust-osdev/ci-update
Update Azure Pipelines CI script
2 parents 12a6a72 + 1b6a0a6 commit 2ef31a7

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

azure-pipelines.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
# Documentation: https://aka.ms/yaml
22

33
trigger:
4-
batch: true
54
branches:
65
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'
139

1410
jobs:
1511
- job: build
@@ -50,14 +46,12 @@ jobs:
5046
condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
5147
displayName: 'Install Rust (Linux/macOS)'
5248
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
5450
condition: eq( variables['Agent.OS'], 'Windows_NT' )
55-
displayName: 'Install Rust (Windows)'
51+
displayName: 'Set Rust Toolchain (Windows)'
5652

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'
6155

6256
- script: |
6357
rustc -Vv
@@ -111,14 +105,12 @@ jobs:
111105
condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
112106
displayName: 'Install Rust (Linux/macOS)'
113107
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
115109
condition: eq( variables['Agent.OS'], 'Windows_NT' )
116-
displayName: 'Install Rust (Windows)'
110+
displayName: 'Set Rust Toolchain (Windows)'
117111

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'
122114

123115
- script: |
124116
rustc -Vv

0 commit comments

Comments
 (0)