Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 78eb87b

Browse files
jneirajneira
authored
Merge pull request #1697 from jneira/ghc-8.8.3
Support for ghc-8.8.3
2 parents 099e4c4 + 6aa0e39 commit 78eb87b

12 files changed

+40
-52
lines changed

‎.azure/linux-cabal.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ jobs:
55
vmImage: ubuntu-16.04
66
strategy:
77
matrix:
8+
ghc-8.8.3:
9+
GHC_VERSION: "8.8.3"
810
ghc-8.8.2:
911
GHC_VERSION: "8.8.2"
1012
ghc-8.6.5:

‎.azure/linux-stack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
matrix:
88
stack-def:
99
YAML_FILE: stack.yaml
10+
stack-8.8.3:
11+
YAML_FILE: stack-8.8.3.yaml
1012
stack-8.8.2:
1113
YAML_FILE: stack-8.8.2.yaml
12-
stack-8.8.1:
13-
YAML_FILE: stack-8.8.1.yaml
1414
stack-8.6.5:
1515
YAML_FILE: stack-8.6.5.yaml
1616
stack-8.6.4:

‎.azure/macos-installhs-cabal.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
displayName: "Unpack cache"
2222
condition: eq(variables.CACHE_RESTORED, 'true')
2323
- bash: |
24-
# TODO Install ghc-8.8.3 when adding stack-8.8.3.yaml
25-
brew install [email protected]
24+
brew install [email protected]
2625
brew install cabal-install --ignore-dependencies ghc
2726
which cabal
2827
which ghc

‎.azure/macos-stack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
matrix:
88
stack-def:
99
YAML_FILE: stack.yaml
10+
stack-8.8.3:
11+
YAML_FILE: stack-8.8.3.yaml
1012
stack-8.8.2:
1113
YAML_FILE: stack-8.8.2.yaml
12-
stack-8.8.1:
13-
YAML_FILE: stack-8.8.1.yaml
1414
stack-8.6.5:
1515
YAML_FILE: stack-8.6.5.yaml
1616
stack-8.6.4:

‎.azure/windows-cabal.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
matrix:
88
# ghc versions 8.8.1 and 8.8.2 are not usable in windows
99
# due to https://gitlab.haskell.org/ghc/ghc/issues/17575
10-
# ghc-8.8.2:
11-
# GHC_VERSION: "8.8.2"
10+
# ghc-8.8.3 throws segfaults in ci envs so we can't use it neither
11+
# due to https://gitlab.haskell.org/ghc/ghc/issues/17926
1212
ghc-8.6.5:
1313
GHC_VERSION: "8.6.5"
1414
ghc-8.4.4:
@@ -106,8 +106,8 @@ jobs:
106106
- bash: |
107107
source .azure/windows-cabal.bashrc
108108
# Needed for wrapper-test
109-
stack setup --stack-yaml stack-8.8.1.yaml
110-
stack setup --stack-yaml stack-8.6.5.yaml
109+
stack setup --resolver ghc-8.8.1
110+
stack setup --resolver ghc-8.6.5
111111
# TODO Enable :dispatcher-test suite
112112
cabal v2-test :plugin-dispatcher-test :wrapper-test # :dispatcher-test --project-file $PROJECT_FILE
113113
displayName: "Run Test: dispatcher-test, plugin-dispatcher-test and wrapper-test"

‎.azure/windows-installhs-stack.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
variables:
77
YAML_FILE: install/shake.yaml
88
STACK_ROOT: "C:\\sr"
9+
GHC_VERSION: "8.6.5"
910
steps:
1011
- task: Cache@2
1112
inputs:
@@ -46,7 +47,8 @@ jobs:
4647
- bash: |
4748
source .azure/windows-stack.bashrc
4849
# Some executions fails with spurious errors installing executables
49-
stack install.hs latest || stack install.hs latest
50+
# We can't install the latest target cause it is ghc-8.8.3 and throws segfaults
51+
stack install.hs hie-${GHC_VERSION} || stack install.hs hie-${GHC_VERSION}
5052
displayName: Run latest target of `install.hs`
5153
- bash: |
5254
mkdir -p .azure-cache

‎.azure/windows-stack.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ jobs:
55
vmImage: windows-2019
66
strategy:
77
matrix:
8-
# default stack.yaml uses ghc-8.8.2 so we can't use it for windows
9-
# TODO: Enable it when it uses ghc-8.8.3
8+
# default stack.yaml uses ghc-8.8.3 so we can't use it for windows
9+
# TODO: Enable it when it uses a version without bugs for windows
1010
# stack-def:
1111
# YAML_FILE: stack.yaml
1212
# ghc versions 8.8.1 and 8.8.2 are not usable in windows
1313
# due to https://gitlab.haskell.org/ghc/ghc/issues/17575
14+
# ghc-8.8.3 throws segfaults in ci envs so we can't use it neither
15+
# due to https://gitlab.haskell.org/ghc/ghc/issues/17926
1416
stack-8.6.5:
1517
YAML_FILE: stack-8.6.5.yaml
1618
stack-8.6.4:
@@ -117,8 +119,8 @@ jobs:
117119
- bash: |
118120
source .azure/windows-stack.bashrc
119121
# Needed for wrapper-test
120-
stack setup --stack-yaml stack-8.8.1.yaml
121-
stack setup --stack-yaml stack-8.6.5.yaml
122+
stack setup --resolver ghc-8.8.1
123+
stack setup --resolver ghc-8.6.5
122124
# TODO: Enable :dispatcher-test suite
123125
stack test :plugin-dispatcher-test :wrapper-test --stack-yaml $(YAML_FILE)
124126
displayName: "Run Test: dispatcher-test, plugin-dispatcher-test and wrapper-test"

‎.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ jobs:
126126
- STACK_FILE: "stack-8.6.5.yaml"
127127
<<: *defaults
128128

129-
ghc-8.8.1:
129+
ghc-8.8.2:
130130
environment:
131-
- STACK_FILE: "stack-8.8.1.yaml"
131+
- STACK_FILE: "stack-8.8.2.yaml"
132132
<<: *defaults
133133

134-
ghc-8.8.2:
134+
ghc-8.8.3:
135135
environment:
136-
- STACK_FILE: "stack-8.8.2.yaml"
136+
- STACK_FILE: "stack-8.8.3.yaml"
137137
<<: *defaults
138138

139139
ghc-nightly:
@@ -181,7 +181,7 @@ workflows:
181181
- ghc-8.4.4
182182
- ghc-8.6.4
183183
- ghc-8.6.5
184-
- ghc-8.8.1
185184
- ghc-8.8.2
185+
- ghc-8.8.3
186186
- ghc-nightly
187187
- cabal

‎install/shake.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Used to provide a different environment for the shake build script
2-
resolver: lts-13.19 # last lts with GHC 8.6.5
3-
# resolver: nightly-2020-01-31 # GHC 8.8.2
4-
# resolver: nightly-2020-01-21 # last nightly GHC 8.8.1
2+
resolver: lts-14.27 # last lts GHC 8.6.5
3+
# resolver: lts-15.7 # lts GHC 8.8.3
4+
# resolver: lts-15.3 # last lts GHC 8.8.2
55
# resolver: lts-13.19 # last lts GHC 8.6.4
66
# resolver: lts-12.26 # last lts GHC 8.4.4
77
# resolver: lts-12.14 # last lts GHC 8.4.3

‎stack-8.8.1.yaml renamed to ‎stack-8.8.3.yaml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
1-
resolver: nightly-2020-01-21 # last GHC 8.8.1
1+
resolver: lts-15.4
22
packages:
33
- .
44
- hie-plugin-api
55

66
extra-deps:
77
# - ./submodules/HaRe
88

9-
- aeson-1.4.6.0
109
- apply-refact-0.7.0.0
11-
- brittany-0.12.1.1
12-
- bytestring-trie-0.2.5.0
10+
- bytestring-trie-0.2.5.0@rev1
1311
# - cabal-helper-1.0.0.0
1412
- github: DanielG/cabal-helper
1513
commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
1614
- clock-0.7.2
1715
- constrained-dynamic-0.1.0.0
18-
- extra-1.6.21
1916
- floskell-0.10.2
20-
- ghc-lib-parser-ex-8.8.5.3
21-
- haddock-api-2.23.0
22-
- haddock-library-1.8.0
23-
- haskell-lsp-0.20.0.0
24-
- haskell-lsp-types-0.20.0.0
25-
- lsp-test-0.10.1.0
26-
- hie-bios-0.4.0
27-
- hlint-2.2.11
17+
- haddock-api-2.23.1
2818
- hoogle-5.0.17.15
2919
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170
20+
- ghc-lib-parser-8.8.2.20200205
21+
- ghc-lib-parser-ex-8.8.5.3
3022
- ilist-0.3.1.0
3123
- monad-dijkstra-0.1.1.2
32-
- ormolu-0.0.3.1
33-
- resourcet-1.2.3 # forced by unliftio-core >= 0.2
3424
- semigroups-0.18.5
3525
- temporary-1.2.1.1
36-
- unliftio-0.2.12.1
3726
- unliftio-core-0.2.0.1
3827

3928
flags:
@@ -42,8 +31,6 @@ flags:
4231
hie-plugin-api:
4332
pedantic: true
4433

45-
# allow-newer: true
46-
4734
nix:
4835
packages: [ icu libcxx zlib ]
4936

0 commit comments

Comments
 (0)