Skip to content

Commit

Permalink
Update Azure CI
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg committed Mar 8, 2020
1 parent 7b442cb commit 8d454ff
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 34 deletions.
17 changes: 5 additions & 12 deletions .azure/azure-linux-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 7 additions & 10 deletions .azure/azure-osx-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .azure/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 7 additions & 10 deletions .azure/azure-windows-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8d454ff

Please sign in to comment.