better matrixed builds, fixed macOS image

metrics-rs · Apr 12, 2020 · 78a7e72 · 78a7e72
1 parent d97182e
commit 78a7e72
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/ci/azure-bench-stable.yml b/ci/azure-bench-stable.yml
@@ -3,12 +3,12 @@ jobs:
   displayName: Bench Stable
   strategy:
     matrix:
-      Linux:
-        vmImage: ubuntu-16.04
-      MacOS:
-        vmImage: macOS-10.13
-      Windows:
-        vmImage: vs2017-win2016
+      "(Ubuntu 18.04)":
+        vmImage: ubuntu-18.04
+      "(macOS X Catalina)":
+        vmImage: macOS-10.15
+      "(Windows Server 2019)":
+        vmImage: windows-2019
   pool:
     vmImage: $(vmImage)
 

diff --git a/ci/azure-rustfmt.yml b/ci/azure-rustfmt.yml
@@ -3,7 +3,7 @@ jobs:
 - job: rustfmt
   displayName: Check rustfmt
   pool:
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-18.04
   steps:
     - template: azure-install-rust.yml
       parameters:

diff --git a/ci/azure-test-minimum.yaml b/ci/azure-test-minimum.yaml
@@ -3,12 +3,18 @@ jobs:
   displayName: Test Minimum
   strategy:
     matrix:
-      Linux:
+      "(Ubuntu 16.04)":
         vmImage: ubuntu-16.04
-      MacOS:
-        vmImage: macOS-10.13
-      Windows:
+      "(Ubuntu 18.04)":
+        vmImage: ubuntu-18.04
+      "(macOS X Mojave)":
+        vmImage: macOS-10.14
+      "(macOS X Catalina)":
+        vmImage: macOS-10.15
+      "(Windows Server 2016)":
         vmImage: vs2017-win2016
+      "(Windows Server 2019)":
+        vmImage: windows-2019
   pool:
     vmImage: $(vmImage)
 

diff --git a/ci/azure-test-nightly.yml b/ci/azure-test-nightly.yml
@@ -3,12 +3,18 @@ jobs:
   displayName: Test Nightly
   strategy:
     matrix:
-      Linux:
+      "(Ubuntu 16.04)":
         vmImage: ubuntu-16.04
-      MacOS:
-        vmImage: macOS-10.13
-      Windows:
+      "(Ubuntu 18.04)":
+        vmImage: ubuntu-18.04
+      "(macOS X Mojave)":
+        vmImage: macOS-10.14
+      "(macOS X Catalina)":
+        vmImage: macOS-10.15
+      "(Windows Server 2016)":
         vmImage: vs2017-win2016
+      "(Windows Server 2019)":
+        vmImage: windows-2019
   pool:
     vmImage: $(vmImage)
 

diff --git a/ci/azure-test-stable.yml b/ci/azure-test-stable.yml
@@ -3,12 +3,18 @@ jobs:
   displayName: Test Stable
   strategy:
     matrix:
-      Linux:
+      "(Ubuntu 16.04)":
         vmImage: ubuntu-16.04
-      MacOS:
-        vmImage: macOS-10.13
-      Windows:
+      "(Ubuntu 18.04)":
+        vmImage: ubuntu-18.04
+      "(macOS X Mojave)":
+        vmImage: macOS-10.14
+      "(macOS X Catalina)":
+        vmImage: macOS-10.15
+      "(Windows Server 2016)":
         vmImage: vs2017-win2016
+      "(Windows Server 2019)":
+        vmImage: windows-2019
   pool:
     vmImage: $(vmImage)