Refactor pipelines configuration slightly

Author: alexcrichton

azure-pipelines.yml

@@ -3,26 +3,29 @@ trigger:
 
 jobs:
 - template: ci/azure-job-test-all.yml
+  parameters:
+    name: Linux_stable
 - template: ci/azure-job-test-all.yml
   parameters:
-    os: macOS
     vmImage: macOS-10.13
+    name: Darwin_stable
 - template: ci/azure-job-test-all.yml
   parameters:
     toolchain: beta
+    name: Linux_beta
 - template: ci/azure-job-test-all.yml
   parameters:
     toolchain: nightly
+    name: Linux_nightly
 - template: ci/azure-job-test-all.yml
   parameters:
-    os: Windows
     vmImage: vs2017-win2016
+    name: Windows_stable
 - template: ci/azure-job-test-all.yml
   parameters:
-    os: Windows
     vmImage: vs2017-win2016
     toolchain: stable-x86_64-gnu
-    name: Windows_x86_64_MinGW
+    name: Windows_stable_MinGW
 - job: systest
   steps:
     - template: ci/azure-install-rust.yml

ci/azure-install-rust.yml

@@ -1,24 +1,23 @@
 parameters:
-  os: 'Linux'
   toolchain: 'stable'
 
 steps:
-  - ${{ if ne(parameters.os, 'Windows') }}:
-    - script: |
-        curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
-        echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
-      displayName: Install rust
-      env:
-        TOOLCHAIN: ${{ parameters.toolchain }}
+  - bash: |
+      curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
+      echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
+    displayName: Install rust
+    condition: ne( variables['Agent.OS'], 'Windows_NT' )
+    env:
+      TOOLCHAIN: ${{ parameters.toolchain }}
 
-  - ${{ if eq(parameters.os, 'Windows') }}:
-    - script: |
-        curl -sSf -o rustup-init.exe https://win.rustup.rs
-        rustup-init.exe -y --default-toolchain %TOOLCHAIN%
-        echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
-      displayName: Install rust
-      env:
-        TOOLCHAIN: ${{ parameters.toolchain }}
+  - script: |
+      curl -sSf -o rustup-init.exe https://win.rustup.rs
+      rustup-init.exe -y --default-toolchain %TOOLCHAIN%
+      echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
+    displayName: Install rust
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
+    env:
+      TOOLCHAIN: ${{ parameters.toolchain }}
 
   - script: |
         rustc -Vv

ci/azure-job-test-all.yml

@@ -1,17 +1,15 @@
 parameters:
-  os: 'Linux'
   toolchain: 'stable'
   vmImage: 'ubuntu-16.04'
   name: ''
 
 jobs:
-- job: ${{ coalesce(parameters.name, format('{0}_{1}', parameters.os, parameters.toolchain)) }}
+- job: ${{ parameters.name }}
   pool:
     vmImage: ${{ parameters.vmImage }}
   steps:
     - template: azure-install-rust.yml
       parameters:
-        os: ${{ parameters.os }}
         toolchain: ${{ parameters.toolchain }}
     - script: cargo build
     - script: rustdoc --test README.md -L target/debug/deps --extern flate2=target/debug/libflate2.rlib