Skip to content

Commit 552b139

Browse files
committed
Run the Minimum Rust CI job on Windows and fix Linux.
1 parent 0409188 commit 552b139

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

azure-pipelines.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,24 @@ trigger:
22
- master
33

44
jobs:
5-
- job: min
6-
displayName: Minimum Rust
5+
- job: min_linux
6+
pool:
7+
vmImage: ubuntu-16.04
8+
displayName: Minimum Rust (Linux)
9+
variables:
10+
TOOLCHAIN: 1.16.0
11+
steps:
12+
- template: ci/azure-install-rust.yml
13+
- script: cargo build
14+
15+
- job: min_Windows
16+
pool:
17+
vmImage: vs2017-win2016
18+
displayName: Minimum Rust (Windows)
19+
variables:
20+
TOOLCHAIN: 1.16.0
721
steps:
822
- template: ci/azure-install-rust.yml
9-
parameters:
10-
toolchain: 1.16.0
1123
- script: cargo build
1224

1325
- job: Linux

ci/azure-install-rust.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ steps:
1111
condition: ne( variables['Agent.OS'], 'Windows_NT' )
1212
1313
- script: |
14+
IF "%TOOLCHAIN%"=="" (SET TOOLCHAIN=stable-%TARGET%)
1415
curl -sSf -o rustup-init.exe https://win.rustup.rs
15-
rustup-init.exe -y --default-toolchain stable-%TARGET%
16+
rustup-init.exe -y --default-toolchain %TOOLCHAIN%
1617
echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
1718
displayName: Install rust (windows)
1819
condition: eq( variables['Agent.OS'], 'Windows_NT' )

0 commit comments

Comments
 (0)