From 8d454ff44e39801629bba84463b0f37211e732c5 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 8 Mar 2020 08:14:34 +0200
Subject: [PATCH] Update Azure CI

---
 .azure/azure-linux-template.yml   | 17 +++++------------
 .azure/azure-osx-template.yml     | 17 +++++++----------
 .azure/azure-pipelines.yml        |  4 ++--
 .azure/azure-windows-template.yml | 17 +++++++----------
 4 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml
index 6efa4cc7..eb48c90e 100644
--- a/.azure/azure-linux-template.yml
+++ b/.azure/azure-linux-template.yml
@@ -5,23 +5,16 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      stack-lts-11:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.2:
         ARGS: "--resolver lts-11"
-      stack-lts-12:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.4:
         ARGS: "--resolver lts-12"
-      stack-lts-14:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.6:
         ARGS: "--resolver lts-14"
+      GHC 8.8:
+        ARGS: "--resolver lts-15"
       nightly:
-        BUILD: stack
-        STACK_YAML: stack-nightly.yaml
         ARGS: "--resolver nightly"
-    maxParallel: 6
   steps:
   - script: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
diff --git a/.azure/azure-osx-template.yml b/.azure/azure-osx-template.yml
index 0ce3ce0b..982278a6 100644
--- a/.azure/azure-osx-template.yml
+++ b/.azure/azure-osx-template.yml
@@ -5,19 +5,16 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      stack-lts-11:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.2:
         ARGS: "--resolver lts-11"
-      stack-lts-12:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.4:
         ARGS: "--resolver lts-12"
-      stack-lts-14:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.6:
         ARGS: "--resolver lts-14"
-    maxParallel: 3
+      GHC 8.8:
+        ARGS: "--resolver lts-15"
+      nightly:
+        ARGS: "--resolver nightly"
   steps:
   - script: |
       export PATH=$HOME/.local/bin:$PATH
diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index 870176e1..d5b59e83 100644
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@@ -14,13 +14,13 @@ jobs:
 - template: azure-linux-template.yml
   parameters:
     name: Linux
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-18.04
     os: linux
 
 - template: azure-osx-template.yml
   parameters:
     name: macOS
-    vmImage: macOS-10.13
+    vmImage: macOS-10.14
     os: osx
 
 - template: azure-windows-template.yml
diff --git a/.azure/azure-windows-template.yml b/.azure/azure-windows-template.yml
index 7a29c843..87503bb3 100644
--- a/.azure/azure-windows-template.yml
+++ b/.azure/azure-windows-template.yml
@@ -5,19 +5,16 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      stack-lts-11:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.2:
         ARGS: "--resolver lts-11"
-      stack-lts-12:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.4:
         ARGS: "--resolver lts-12"
-      stack-lts-14:
-        BUILD: stack
-        STACK_YAML: stack.yaml
+      GHC 8.6:
         ARGS: "--resolver lts-14"
-    maxParallel: 3
+      GHC 8.8:
+        ARGS: "--resolver lts-15"
+      nightly:
+        ARGS: "--resolver nightly"
   steps:
   - bash: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;