From 78a7e725b2366622a6c5d12dab26f8dda3d8cc9e Mon Sep 17 00:00:00 2001
From: Toby Lawrence <toby@nuclearfurnace.com>
Date: Sat, 11 Apr 2020 20:11:08 -0400
Subject: [PATCH] better matrixed builds, fixed macOS image

---
 ci/azure-bench-stable.yml  | 12 ++++++------
 ci/azure-rustfmt.yml       |  2 +-
 ci/azure-test-minimum.yaml | 14 ++++++++++----
 ci/azure-test-nightly.yml  | 14 ++++++++++----
 ci/azure-test-stable.yml   | 14 ++++++++++----
 5 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/ci/azure-bench-stable.yml b/ci/azure-bench-stable.yml
index eb7260c..52320a4 100644
--- 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
index cb52dbb..d7ce1a6 100644
--- 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
index e74089c..43954bd 100644
--- 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
index 42020a1..dc6bc60 100644
--- 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
index e29d2b9..ca5e760 100644
--- 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)