Azure matrix/stack.yaml update

2020-03-24 12:20:19 +02:00 · 2020-03-24 12:20:19 +02:00 · 4a4dd06df8
commit 4a4dd06df8
parent 179296c568
10 changed files with 21 additions and 166 deletions
--- a/.azure/azure-linux-template.yml
+++ b/.azure/azure-linux-template.yml
@ -5,31 +5,14 @@ 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"
-      stack-persistent-2-9:
-        BUILD: stack
-        STACK_YAML: stack-persistent-2-9.yaml
-        ARGS: ""
-      stack-persistent-2-10:
-        BUILD: stack
-        STACK_YAML: stack-persistent-2-10.yaml
-        ARGS: ""
-      nightly:
-        BUILD: stack
-        STACK_YAML: stack-nightly.yaml
-        ARGS: "--resolver nightly"
-    maxParallel: 6
+      GHC 8.8:
+        ARGS: "--resolver lts-15"
  steps:
  - script: |
      export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
--- a/.azure/azure-osx-template.yml
+++ b/.azure/azure-osx-template.yml
@ -5,27 +5,14 @@ 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"
-      stack-persistent-2-9:
-        BUILD: stack
-        STACK_YAML: stack-persistent-2-9.yaml
-        ARGS: ""
-      stack-persistent-2-10:
-        BUILD: stack
-        STACK_YAML: stack-persistent-2-10.yaml
-        ARGS: ""
-    maxParallel: 3
+      GHC 8.8:
+        ARGS: "--resolver lts-15"
  steps:
  - script: |
      export PATH=$HOME/.local/bin:$PATH
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@ -14,17 +14,17 @@ jobs:
 - template: azure-linux-template.yml
  parameters:
    name: Linux
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-latest
    os: linux

 - template: azure-osx-template.yml
  parameters:
    name: macOS
-    vmImage: macOS-10.13
+    vmImage: macOS-latest
    os: osx

 - template: azure-windows-template.yml
  parameters:
   name: Windows
-   vmImage: vs2017-win2016
+   vmImage: windows-latest
   os: windows
--- a/.azure/azure-windows-template.yml
+++ b/.azure/azure-windows-template.yml
@ -5,19 +5,12 @@ 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
  steps:
  - bash: |
      export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
--- a/stack-nightly.yaml
+++ b/stack-nightly.yaml
@ -1,22 +0,0 @@
-resolver: nightly-2019-11-11
-packages:
- ./yesod-core
- ./yesod-static
- ./yesod-persistent
- ./yesod-newsfeed
- ./yesod-form
- ./yesod-form-multi
- ./yesod-auth
- ./yesod-auth-oauth
- ./yesod-sitemap
- ./yesod-test
- ./yesod-bin
- ./yesod
- ./yesod-eventsource
- ./yesod-websockets
-extra-deps:
- html-conduit-1.3.2.1
- persistent-2.10.4
- persistent-template-2.7.3
- persistent-sqlite-2.10.5
- authenticate-1.3.5
--- a/stack-nightly.yaml.lock
+++ b/stack-nightly.yaml.lock
@ -1,47 +0,0 @@
-# This file was autogenerated by Stack.
-# You should not edit this file by hand.
-# For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
-
-packages:
- completed:
-    hackage: html-conduit-1.3.2.1@sha256:61a9fe9e4c28c5feb7f68a84cac846a8db96bc46434e739f722fddaca7939529,2104
-    pantry-tree:
-      size: 504
-      sha256: 7e22a5f73125fa55b396e7a3deeadeba8d9c8e56668df5ad2ea0d5a3d240864a
-  original:
-    hackage: html-conduit-1.3.2.1
- completed:
-    hackage: persistent-2.10.4@sha256:16c4c0823dd5e16bac4d607895ab0f4febd0626c020e5755ed1a52bf04068148,4738
-    pantry-tree:
-      size: 2094
-      sha256: b40d1783b539ddbbceaa827bf286d0b3bfcf76ca19e604c9d510b2a64008714e
-  original:
-    hackage: persistent-2.10.4
- completed:
-    hackage: persistent-template-2.7.3@sha256:ac3e5e8c48e968b927bbf4e97162c52e7e417d69b05efeb1c581d7c682e043d2,2703
-    pantry-tree:
-      size: 560
-      sha256: fdfb2a721eb9c9831d7381d36bc52de0808a008ed3d553b6490080f337249684
-  original:
-    hackage: persistent-template-2.7.3
- completed:
-    hackage: persistent-sqlite-2.10.5@sha256:50f8e3991fcf57d5744313fab8ecfa056d367d110aae43c03c45546445fea990,4993
-    pantry-tree:
-      size: 748
-      sha256: 42a52062ae795140362c2d929ba82f823904b785740a0837141c96eeec013115
-  original:
-    hackage: persistent-sqlite-2.10.5
- completed:
-    hackage: authenticate-1.3.5@sha256:47b932a0f48a2ef2dff598519c5d6161214e6b5c1156732b5e157de5784b3798,2108
-    pantry-tree:
-      size: 845
-      sha256: 597a081d3c6796d9b0ca6125e455c9e4b05da2a8db2d35c57afc292a8db7b89e
-  original:
-    hackage: authenticate-1.3.5
-snapshots:
- completed:
-    size: 418944
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2019/11/11.yaml
-    sha256: 12d3c25a6471bd6310df0fb5c064c24fc8aa8c5e9412d90e7980f36aa0cdd3f9
-  original: nightly-2019-11-11
--- a/stack-persistent-2-10.yaml
+++ b/stack-persistent-2-10.yaml
@ -1,20 +0,0 @@
-resolver: lts-13.17
-packages:
- ./yesod-core
- ./yesod-static
- ./yesod-persistent
- ./yesod-newsfeed
- ./yesod-form
- ./yesod-form-multi
- ./yesod-auth
- ./yesod-auth-oauth
- ./yesod-sitemap
- ./yesod-test
- ./yesod-bin
- ./yesod
- ./yesod-eventsource
- ./yesod-websockets
-extra-deps:
- persistent-2.10.0@rev:0
- persistent-sqlite-2.10.0@rev:0
- persistent-template-2.7.0@rev:0
--- a/stack-persistent-2-9.yaml
+++ b/stack-persistent-2-9.yaml
@ -1,19 +0,0 @@
-resolver: lts-11.10
-packages:
- ./yesod-core
- ./yesod-static
- ./yesod-persistent
- ./yesod-newsfeed
- ./yesod-form
- ./yesod-form-multi
- ./yesod-auth
- ./yesod-auth-oauth
- ./yesod-sitemap
- ./yesod-test
- ./yesod-bin
- ./yesod
- ./yesod-eventsource
- ./yesod-websockets
-extra-deps:
- persistent-2.9.0@rev:0
- persistent-sqlite-2.9.0@rev:0
--- a/stack.yaml
+++ b/stack.yaml
@ -1,4 +1,4 @@
-resolver: lts-13.4
+resolver: lts-15.5
 packages:
 - ./yesod-core
 - ./yesod-static
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 494984
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/4.yaml
-    sha256: ba80f9f1f517b9c79a3f32944558fa29837a152eae8dcd0891317338920c2ed8
-  original: lts-13.4
+    size: 491372
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/5.yaml
+    sha256: 1b549cfff328040c382a70a84a2087aac8dab6d778bf92f32a93a771a1980dfc
+  original: lts-15.5