Merge pull request #1609 from jneira/azure-update-macos

Azure: update macos version and try to fix windows+stack builds

Author: jneira

.azure/macos-installhs-stack.yml

@@ -2,7 +2,7 @@ jobs:
 - job: MacOs_installhs_Stack
   timeoutInMinutes: 0
   pool:
-    vmImage: macOS-10.13
+    vmImage: macOS-10.14
   variables:
     YAML_FILE: install/shake.yaml
   steps:

.azure/macos-stack.yml

@@ -2,7 +2,7 @@ jobs:
 - job: MacOs_Stack
   timeoutInMinutes: 0
   pool:
-    vmImage: macOS-10.13
+    vmImage: macOS-10.14
   strategy:
     matrix:
       stack-def:

.azure/windows-stack.yml

@@ -48,6 +48,7 @@ jobs:
   - bash: |
       source .azure/windows-stack.bashrc
       stack setup --stack-yaml $(YAML_FILE)
+      stack setup --resolver=lts-13.20 # for liquidhaskell
     displayName: Install GHC
   - bash: |
       source .azure/windows-stack.bashrc
@@ -87,7 +88,6 @@ jobs:
     displayName: "Install Runtime Test-Dependencies: z3"
   - bash: |
       source .azure/windows-stack.bashrc
-      stack setup --resolver=lts-13.20 
       stack install --resolver=lts-13.20 liquid-fixpoint-0.8.0.2 liquidhaskell-0.8.6.2
     displayName: "Install Runtime Test-Dependencies: liquidhaskell"
   - bash: |